diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-09-03 23:39:51 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-09-03 23:39:51 +0200 |
| commit | 5c01d5d1342a19712cbfba438d1ef33e4c868c8c (patch) | |
| tree | 778d6ec74a45ab2046d6732901c6eef9f733ba34 /arch | |
| parent | ARM: dts: dra7-evm: Fix 8th NAND partition's name (diff) | |
| parent | ARM: dts: set 'ti,set-rate-parent' for dpll4_m5x2 clock (diff) | |
| download | linux-5c01d5d1342a19712cbfba438d1ef33e4c868c8c.tar.xz linux-5c01d5d1342a19712cbfba438d1ef33e4c868c8c.zip | |
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.dtsi | 1 |
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 { |