summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx31.dtsi
diff options
context:
space:
mode:
authorVladimir Zapolskiy <vz@mleia.com>2016-09-26 03:03:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-26 08:23:47 +0100
commitd2e4968e3c0d62706b987dcf99c4702b5d7d8d0b (patch)
tree56edabd2b249fde3ef13d6d8ea2afaab4282a074 /arch/arm/boot/dts/imx31.dtsi
parent280d00a94293508cf1a91892e6ad5c94b0d33862 (diff)
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
commit 1f87aee6a2e55eda466a43ba6248a8b75eede153 upstream. i.MX31 Clock Control Module controller is found on AIPS2 bus, move it there from SPBA bus to avoid a conflict of device IO space mismatch. Fixes: ef0e4a606fb6 ("ARM: mx31: Replace clk_register_clkdev with clock DT lookup") Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx31.dtsi')
-rw-r--r--arch/arm/boot/dts/imx31.dtsi14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 48a1dd52f8ff..ba790be5ee08 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -110,13 +110,6 @@
interrupts = <19>;
clocks = <&clks 25>;
};
-
- clks: ccm@53f80000{
- compatible = "fsl,imx31-ccm";
- reg = <0x53f80000 0x4000>;
- interrupts = <31>, <53>;
- #clock-cells = <1>;
- };
};
aips@53f00000 { /* AIPS2 */
@@ -126,6 +119,13 @@
reg = <0x53f00000 0x100000>;
ranges;
+ clks: ccm@53f80000{
+ compatible = "fsl,imx31-ccm";
+ reg = <0x53f80000 0x4000>;
+ interrupts = <31>, <53>;
+ #clock-cells = <1>;
+ };
+
gpt: timer@53f90000 {
compatible = "fsl,imx31-gpt";
reg = <0x53f90000 0x4000>;