diff options
| author | Vladimir Zapolskiy <vz@mleia.com> | 2016-09-26 03:03:41 +0300 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2016-11-01 16:43:10 +0800 |
| commit | 1f87aee6a2e55eda466a43ba6248a8b75eede153 (patch) | |
| tree | 322054845ba4d9fd71578911fef01314cc5394c2 | |
| parent | 2e575cbc930901718cc18e084566ecbb9a4b5ebb (diff) | |
| download | blackbird-op-linux-1f87aee6a2e55eda466a43ba6248a8b75eede153.tar.gz blackbird-op-linux-1f87aee6a2e55eda466a43ba6248a8b75eede153.zip | |
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
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>
| -rw-r--r-- | arch/arm/boot/dts/imx31.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi index 3e0893ea2581..8d4c0e3533fa 100644 --- a/arch/arm/boot/dts/imx31.dtsi +++ b/arch/arm/boot/dts/imx31.dtsi @@ -118,13 +118,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 */ @@ -134,6 +127,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>; |
