summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap3xxx-clocks.dtsi
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-09-26 16:09:39 -0700
committerMike Turquette <mturquette@linaro.org>2014-09-26 16:09:39 -0700
commitb6b2fe5b6e956c8217a7584472a3ac5c068b61d4 (patch)
tree899d38684e674a05fc3e4ae2885529b916583323 /arch/arm/boot/dts/omap3xxx-clocks.dtsi
parentb52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff)
parentb9e742c3164344fece3615aca42ec51b41753908 (diff)
Merge tag 'tegra-clk-3.18' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next
Tegra clk updates for 3.18
Diffstat (limited to 'arch/arm/boot/dts/omap3xxx-clocks.dtsi')
-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 {