diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-07-27 03:19:45 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-08-22 11:29:53 -0400 |
commit | 677e28b1cc82777a2f8903de8fe0f0f3d14c2af5 (patch) | |
tree | 9a3856cd8d67d16b3654868c345115f3408b8442 | |
parent | c574fa93af1bf4e83bc9281646c74038e8739d67 (diff) |
ARM: i.MX5 clocks: Remove optional clock setup (CKIH1) from i.MX51 template
External high frequency clock CKIH1 is optional for i.MX51, so move
it setup into boards where it is used.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/imx51-apf51.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51-babbage.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts index 8f7f9ac0b989..b3606993f2e8 100644 --- a/arch/arm/boot/dts/imx51-apf51.dts +++ b/arch/arm/boot/dts/imx51-apf51.dts | |||
@@ -26,10 +26,6 @@ | |||
26 | }; | 26 | }; |
27 | 27 | ||
28 | clocks { | 28 | clocks { |
29 | ckih1 { | ||
30 | clock-frequency = <0>; | ||
31 | }; | ||
32 | |||
33 | osc { | 29 | osc { |
34 | clock-frequency = <33554432>; | 30 | clock-frequency = <33554432>; |
35 | }; | 31 | }; |
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index 7c670a6bf2dc..1d337d99ecd5 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts | |||
@@ -63,6 +63,10 @@ | |||
63 | }; | 63 | }; |
64 | 64 | ||
65 | clocks { | 65 | clocks { |
66 | ckih1 { | ||
67 | clock-frequency = <22579200>; | ||
68 | }; | ||
69 | |||
66 | clk_26M: codec_clock { | 70 | clk_26M: codec_clock { |
67 | compatible = "fixed-clock"; | 71 | compatible = "fixed-clock"; |
68 | reg=<0>; | 72 | reg=<0>; |
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index d7b06461b716..f0b25c91e5eb 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | ckih1 { | 48 | ckih1 { |
49 | compatible = "fsl,imx-ckih1", "fixed-clock"; | 49 | compatible = "fsl,imx-ckih1", "fixed-clock"; |
50 | clock-frequency = <22579200>; | 50 | clock-frequency = <0>; |
51 | }; | 51 | }; |
52 | 52 | ||
53 | ckih2 { | 53 | ckih2 { |