UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: ef0e4a606f ("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>
This commit is contained in:
Vladimir Zapolskiy 2016-09-26 03:03:41 +03:00 committed by Shawn Guo
parent 2e575cbc93
commit 1f87aee6a2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/imx31.dtsi
View File

@ -118,13 +118,6 @@
interrupts = <19>; interrupts = <19>;
clocks = <&clks 25>; clocks = <&clks 25>;
}; };
clks: ccm@53f80000{
compatible = "fsl,imx31-ccm";
reg = <0x53f80000 0x4000>;
interrupts = <31>, <53>;
#clock-cells = <1>;
};
}; };
aips@53f00000 { /* AIPS2 */ aips@53f00000 { /* AIPS2 */
@ -134,6 +127,13 @@
reg = <0x53f00000 0x100000>; reg = <0x53f00000 0x100000>;
ranges; ranges;
clks: ccm@53f80000{
compatible = "fsl,imx31-ccm";
reg = <0x53f80000 0x4000>;
interrupts = <31>, <53>;
#clock-cells = <1>;
};
gpt: timer@53f90000 { gpt: timer@53f90000 {
compatible = "fsl,imx31-gpt"; compatible = "fsl,imx31-gpt";
reg = <0x53f90000 0x4000>; reg = <0x53f90000 0x4000>;