Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next

[karo-tx-linux.git] / arch / arm / boot / dts / omap54xx-clocks.dtsi

diff --git a/arch/arm/boot/dts/omap54xx-clocks.dtsi b/arch/arm/boot/dts/omap54xx-clocks.dtsi
index 86fc507a05672ca392c471b7e33529cd1ed95bb8..e67a23b5d7884725290b6348a54a97f3427ccbc3 100644 (file)
--- a/arch/arm/boot/dts/omap54xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap54xx-clocks.dtsi
@@ -335,7 +335,7 @@
 
        dpll_mpu_ck: dpll_mpu_ck {
                #clock-cells = <0>;
-               compatible = "ti,omap4-dpll-clock";
+               compatible = "ti,omap5-mpu-dpll-clock";
                clocks = <&sys_clkin>, <&mpu_dpll_hs_clk_div>;
                reg = <0x0160>, <0x0164>, <0x016c>, <0x0168>;
        };
@@ -804,6 +804,7 @@
                clocks = <&dpll_per_h12x2_ck>;
                ti,bit-shift = <8>;
                reg = <0x1420>;
+               ti,set-rate-parent;
        };
 
        dss_sys_clk: dss_sys_clk {