projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
280d00a
)
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
author
Vladimir Zapolskiy
<vz@mleia.com>
Mon, 26 Sep 2016 00:03:41 +0000
(
03:03
+0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 26 Jan 2017 07:23:47 +0000
(08:23 +0100)
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>
arch/arm/boot/dts/imx31.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/imx31.dtsi
b/arch/arm/boot/dts/imx31.dtsi
index 48a1dd52f8ff336b61581e6b1b333b52f3b50a29..ba790be5ee080a4f2a9879bb8511f178df3012f3 100644
(file)
--- 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>;