Skip to contentSkip to conversation

ARM: dts: add missing imx dtb targets

PATCH New Shawn Guo 2 participants 3 messages Dec 31, 2012 – Jan 2, 2013

Subsystems (3)
Device tree bindings Arm i.MX and Layerscape Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

PATCH 1/2 ARM: dts: add missing imx dtb targets

Add missing imx dtb targets, so that make dtbs can cover all imx dtbs. It's pretty useful for testing dts changes.

Signed-off-by Shawn Guo <[email protected]>
---
 arch/arm/boot/dts/Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/boot/dts/Makefile +5 -1
index 0a0ec07..e3ae5e2 100644
@@ -79,7 +79,11 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 	armada-370-mirabox.dtb \
 	armada-xp-db.dtb \
 	armada-xp-openblocks-ax3-4.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx27-pdk.dtb \
+dtb-$(CONFIG_ARCH_MXC) += \
+	imx25-karo-tx25.dtb \
+	imx27-apf27.dtb \
+	imx27-pdk.dtb \
+	imx31-bug.dtb \
 	imx51-babbage.dtb \
 	imx53-ard.dtb \
 	imx53-evk.dtb \
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 ARM: dts: imx: use nodes label in board dts

Following omap3-evm.dts way, it changes all imx dts files to use label in board dts to refer to nodes defined by soc dtsi. Thus, the board dts files become easier to read and edit with the least indentation levels.

Signed-off-by Shawn Guo <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts |   30 +--
 arch/arm/boot/dts/imx25.dtsi          |    2 +-
 arch/arm/boot/dts/imx27-apf27.dts     |   82 +++---
 arch/arm/boot/dts/imx27-pdk.dts       |   20 +-
 arch/arm/boot/dts/imx31-bug.dts       |   12 +-
 arch/arm/boot/dts/imx51-babbage.dts   |  456 ++++++++++++++++-----------------
 arch/arm/boot/dts/imx53-ard.dts       |  126 +++++----
 arch/arm/boot/dts/imx53-evk.dts       |  194 +++++++-------
 arch/arm/boot/dts/imx53-qsb.dts       |  380 ++++++++++++++-------------
 arch/arm/boot/dts/imx53-smd.dts       |  294 +++++++++++----------
 arch/arm/boot/dts/imx6q-arm2.dts      |  124 +++++----
 arch/arm/boot/dts/imx6q-sabreauto.dts |   64 +++--
 arch/arm/boot/dts/imx6q-sabrelite.dts |  216 ++++++++--------
 arch/arm/boot/dts/imx6q-sabresd.dts   |  102 ++++----
 arch/arm/boot/dts/imx6q.dtsi          |    2 +-
 15 files changed, 1008 insertions(+), 1096 deletions(-)
arch/arm/boot/dts/imx25-karo-tx25.dts +11 -19
index d81f8a0..eb9b9d1 100644
@@ -19,26 +19,18 @@
 	memory {
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};
+};
 
-	soc {
-		aips at 43f00000 {
-			uart1: serial at 43f90000 {
-				status = "okay";
-			};
-		};
+&uart1 {
+	status = "okay";
+};
 
-		spba at 50000000 {
-			fec: ethernet at 50038000 {
-				status = "okay";
-				phy-mode = "rmii";
-			};
-		};
+&fec {
+	status = "okay";
+	phy-mode = "rmii";
+};
 
-		emi at 80000000 {
-			nand at bb000000 {
-				nand-on-flash-bbt;
-				status = "okay";
-			};
-		};
-	};
+&nfc {
+	nand-on-flash-bbt;
+	status = "okay";
 };
arch/arm/boot/dts/imx25.dtsi +1 -1
index e1b13eb..94f3305 100644
@@ -499,7 +499,7 @@
 			reg = <0x80000000 0x3b002000>;
 			ranges;
 
-			nand at bb000000 {
+			nfc: nand at bb000000 {
 				#address-cells = <1>;
 				#size-cells = <1>;
arch/arm/boot/dts/imx27-apf27.dts +39 -43

97 lines not on this page · raw message

arch/arm/boot/dts/imx27-pdk.dts +7 -13
index 0290978..41cd110 100644
@@ -19,19 +19,13 @@
 	memory {
 		reg = <0x0 0x0>;
 	};
+};
 
-	soc {
-		aipi at 10000000 { /* aipi1 */
-			uart1: serial at 1000a000 {
-				fsl,uart-has-rtscts;
-				status = "okay";
-			};
-		};
+&uart1 {
+	fsl,uart-has-rtscts;
+	status = "okay";
+};
 
-		aipi at 10020000 { /* aipi2 */
-			ethernet at 1002b000 {
-				status = "okay";
-			};
-		};
-	};
+&fec {
+	status = "okay";
 };
arch/arm/boot/dts/imx31-bug.dts +4 -8
index 24731cb..e0bcdde 100644
@@ -19,13 +19,9 @@
 	memory {
 		reg = <0x80000000 0x8000000>; /* 128M */
 	};
+};
 
-	soc {
-		aips at 43f00000 { /* AIPS1 */
-			uart5: serial at 43fb4000 {
-				fsl,uart-has-rtscts;
-				status = "okay";
-			};
-		};
-	};
+&uart5 {
+	fsl,uart-has-rtscts;
+	status = "okay";
 };
arch/arm/boot/dts/imx51-babbage.dts +224 -232

466 lines not on this page · raw message

arch/arm/boot/dts/imx53-ard.dts +60 -66

135 lines not on this page · raw message

arch/arm/boot/dts/imx53-evk.dts +93 -101

203 lines not on this page · raw message

arch/arm/boot/dts/imx53-qsb.dts +186 -194

389 lines not on this page · raw message

arch/arm/boot/dts/imx53-smd.dts +143 -151

303 lines not on this page · raw message

arch/arm/boot/dts/imx6q-arm2.dts +59 -65

133 lines not on this page · raw message

arch/arm/boot/dts/imx6q-sabreauto.dts +29 -35

74 lines not on this page · raw message

arch/arm/boot/dts/imx6q-sabrelite.dts +104 -112

225 lines not on this page · raw message

arch/arm/boot/dts/imx6q-sabresd.dts +47 -55

111 lines not on this page · raw message

arch/arm/boot/dts/imx6q.dtsi +1 -1
index d6265ca..cf25f94 100644
@@ -108,7 +108,7 @@
 			clocks = <&clks 106>;
 		};
 
-		nfc: gpmi-nand at 00112000 {
+		gpmi: gpmi-nand at 00112000 {
 			compatible = "fsl,imx6q-gpmi-nand";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 1 line
1.7.9.5
maintainer
#2 lore raw

PATCH 2/2 ARM: dts: imx: use nodes label in board dts

Quoted 6 lines · Shawn Guo

Following omap3-evm.dts way, it changes all imx dts files to use label in board dts to refer to nodes defined by soc dtsi. Thus, the board dts files become easier to read and edit with the least indentation levels.

Signed-off-by Shawn Guo <[email protected]>

Nice!

Acked-by Sascha Hauer <[email protected]>

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |