[PATCH] ARM: dts: omap36xx: fix dpll4_m4_ck tree

[Christoph Fritz]

OMAP36xx has different hardware implementation for the dpll4_m4_ck tree
compared to other OMAP3 variants. Reflect this properly in the dts file.

before omap dt clock conversion:
             dpll4_m4_ck        1           1            57600000
                dpll4_m4x2_ck   1           1            57600000
                   dss1_alwon_fck_3430es2 2           4            57600000

after omap dt clock conversion:
             dpll4_m4_ck        0           1            96000000   0
                dpll4_m4x2_mul_ck 0           1            192000000  0
                   dpll4_m4x2_ck 0           1            192000000  0
                      dss1_alwon_fck_3430es2 0           4            192000000  0
with this patch:
             dpll4_m4_ck        1           1            57600000   0
                dss1_alwon_fck_3430es2 2           4            57600000   0
                dpll4_m4x2_mul_ck 0           0            115200000  0
                   dpll4_m4x2_ck 0           0            115200000  0

Signed-off-by: Christoph Fritz <chf.fritz@xxxxxxxxxxxxxx>
---
 arch/arm/boot/dts/omap36xx-clocks.dtsi |    8 ++++++++
 arch/arm/boot/dts/omap36xx.dtsi        |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/omap36xx-clocks.dtsi b/arch/arm/boot/dts/omap36xx-clocks.dtsi
index 24869cb..8ac8926 100644
--- a/arch/arm/boot/dts/omap36xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap36xx-clocks.dtsi
@@ -74,6 +74,14 @@
 	clock-div = <2>;
 };
 
+&dpll4_m4_ck {
+	clock-div = <15>;
+};
+
+&dss1_alwon_fck_3430es2 {
+	clocks = <&dpll4_m4_ck>;
+};
+
 &cm_clockdomains {
 	dpll4_clkdm: dpll4_clkdm {
 		compatible = "ti,clockdomain";
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 7e8dee9..5e1bcd0 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -52,7 +52,7 @@
 	};
 };
 
-/include/ "omap36xx-clocks.dtsi"
 /include/ "omap34xx-omap36xx-clocks.dtsi"
 /include/ "omap36xx-omap3430es2plus-clocks.dtsi"
 /include/ "omap36xx-am35xx-omap3430es2plus-clocks.dtsi"
+/include/ "omap36xx-clocks.dtsi"
-- 
1.7.10.4



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/