Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f87aee6 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Shawn Guo
Browse files

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: ef0e4a60 ("ARM: mx31: Replace clk_register_clkdev with clock DT lookup")
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 2e575cbc

arch/arm/boot/dts/imx31.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -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>;