summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-07-27 11:19:45 +0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 23:29:53 +0800
commit677e28b1cc82777a2f8903de8fe0f0f3d14c2af5 (patch)
tree9a3856cd8d67d16b3654868c345115f3408b8442 /arch/arm
parentc574fa93af1bf4e83bc9281646c74038e8739d67 (diff)
downloadop-kernel-dev-677e28b1cc82777a2f8903de8fe0f0f3d14c2af5.zip
op-kernel-dev-677e28b1cc82777a2f8903de8fe0f0f3d14c2af5.tar.gz
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/imx51-apf51.dts4
-rw-r--r--arch/arm/boot/dts/imx51-babbage.dts4
-rw-r--r--arch/arm/boot/dts/imx51.dtsi2
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 8f7f9ac..b360699 100644
--- a/arch/arm/boot/dts/imx51-apf51.dts
+++ b/arch/arm/boot/dts/imx51-apf51.dts
@@ -26,10 +26,6 @@
};
clocks {
- ckih1 {
- clock-frequency = <0>;
- };
-
osc {
clock-frequency = <33554432>;
};
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 7c670a6..1d337d9 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -63,6 +63,10 @@
};
clocks {
+ ckih1 {
+ clock-frequency = <22579200>;
+ };
+
clk_26M: codec_clock {
compatible = "fixed-clock";
reg=<0>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index d7b0646..f0b25c9 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -47,7 +47,7 @@
ckih1 {
compatible = "fsl,imx-ckih1", "fixed-clock";
- clock-frequency = <22579200>;
+ clock-frequency = <0>;
};
ckih2 {
OpenPOWER on IntegriCloud