Merge branch 'for-v3.17-rc/ti-clk-dt' of github.com:t-kristo/linux-pm into fixes-rc3

5c01d5d1 · Tony Lindgren · f0e9fab3 · adf5b4dc · 5c01d5d1
Commit 5c01d5d1 authored Sep 03, 2014 by Tony Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

arch/arm/boot/dts/omap3xxx-clocks.dtsi arch/arm/boot/dts/omap3xxx-clocks.dtsi +1 -0

No files found.
--- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
@@ -467,6 +467,7 @@ dpll4_m5x2_ck: dpll4_m5x2_ck {
 		ti,bit-shift = <0x1e>;
 		reg = <0x0d00>;
 		ti,set-bit-to-disable;
+		ti,set-rate-parent;
 	};

 	dpll4_m6_ck: dpll4_m6_ck {