diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2014-02-26 05:38:09 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-03-13 16:41:50 -0400 |
commit | 7b8b6af169a069454936053631d151a50af7b69a (patch) | |
tree | 2086c35b938e814da97e3ab626f09928649e5783 | |
parent | 8559087f0e9722a95df43fa5968bd1ee42bcf540 (diff) |
ARM: dts: omap4/5: Use l3_ick for the gpmc node
The GPMC clock is derived from l3_ick. The simplest solution is
to reference directly l3_ick to provide the GPMC fck in order to
get correct timings. The real management of the clock is left to
hwmod.
Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index d3f8a6e8ca20..69409f7e05dc 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -275,6 +275,8 @@ | |||
275 | gpmc,num-waitpins = <4>; | 275 | gpmc,num-waitpins = <4>; |
276 | ti,hwmods = "gpmc"; | 276 | ti,hwmods = "gpmc"; |
277 | ti,no-idle-on-init; | 277 | ti,no-idle-on-init; |
278 | clocks = <&l3_div_ck>; | ||
279 | clock-names = "fck"; | ||
278 | }; | 280 | }; |
279 | 281 | ||
280 | uart1: serial@4806a000 { | 282 | uart1: serial@4806a000 { |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index a72813a9663e..7a16647c76f4 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -302,6 +302,8 @@ | |||
302 | gpmc,num-cs = <8>; | 302 | gpmc,num-cs = <8>; |
303 | gpmc,num-waitpins = <4>; | 303 | gpmc,num-waitpins = <4>; |
304 | ti,hwmods = "gpmc"; | 304 | ti,hwmods = "gpmc"; |
305 | clocks = <&l3_iclk_div>; | ||
306 | clock-names = "fck"; | ||
305 | }; | 307 | }; |
306 | 308 | ||
307 | i2c1: i2c@48070000 { | 309 | i2c1: i2c@48070000 { |