summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-09-03 14:39:51 -0700
committerTony Lindgren <tony@atomide.com>2014-09-03 14:39:51 -0700
commit5c01d5d1342a19712cbfba438d1ef33e4c868c8c (patch)
tree778d6ec74a45ab2046d6732901c6eef9f733ba34 /arch
parentf0e9fab3bcb526a45ecbae7ef7e4ceec7852cba4 (diff)
parentadf5b4dcc0cf50715f74f49f3c7af0c80467f55f (diff)
downloadlinux-5c01d5d1342a19712cbfba438d1ef33e4c868c8c.tar.bz2
Merge branch 'for-v3.17-rc/ti-clk-dt' of github.com:t-kristo/linux-pm into fixes-rc3
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/omap3xxx-clocks.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3xxx-clocks.dtsi b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
index e47ff69dcf70..5c375003bad1 100644
--- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
@@ -467,6 +467,7 @@
ti,bit-shift = <0x1e>;
reg = <0x0d00>;
ti,set-bit-to-disable;
+ ti,set-rate-parent;
};
dpll4_m6_ck: dpll4_m6_ck {