Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1228283

[PATCH v2 2/9] ARM: dts: Use label for device nodes in Cygnus dts

Show all headers | View raw

Use label instead of full path to reference device nodes in Cygnus dts
files

Signed-off-by: Ray Jui <rjui@broadcom.com>
Reviewed-by: Scott Branden <sbranden@broadcom.com>
---
 arch/arm/boot/dts/bcm911360_entphn.dts |  8 +++----
 arch/arm/boot/dts/bcm911360k.dts       |  6 ++---
 arch/arm/boot/dts/bcm958300k.dts       | 40 +++++++++++++++++-----------------
 arch/arm/boot/dts/bcm958305k.dts       |  6 ++---
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index 0e1320e..f791a3b 100644
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -44,10 +44,6 @@
 		bootargs = "console=ttyS0,115200";
 	};
 
-	uart3: serial@18023000 {
-		status = "okay";
-	};
-
 	gpio_keys {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
@@ -60,3 +56,7 @@
 		};
 	};
 };
+
+&uart3 {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts
index 2af40c6..814011c 100644
--- a/arch/arm/boot/dts/bcm911360k.dts
+++ b/arch/arm/boot/dts/bcm911360k.dts
@@ -42,8 +42,8 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	uart3: serial@18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
 };
diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
index 75e50f0..d8dc9f0 100644
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -42,32 +42,32 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	pcie0: pcie@18012000 {
-		status = "okay";
-	};
+&pcie0 {
+	status = "okay";
+};
 
-	pcie1: pcie@18013000 {
-		status = "okay";
-	};
+&pcie1 {
+	status = "okay";
+};
 
-	uart3: serial@18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
+};
 
-	nand: nand@18046000 {
-		nandcs@1 {
-			compatible = "brcm,nandcs";
-			reg = <0>;
-			nand-on-flash-bbt;
+&nand {
+	nandcs@1 {
+		compatible = "brcm,nandcs";
+		reg = <0>;
+		nand-on-flash-bbt;
 
-			#address-cells = <1>;
-			#size-cells = <1>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-			nand-ecc-strength = <24>;
-			nand-ecc-step-size = <1024>;
+		nand-ecc-strength = <24>;
+		nand-ecc-step-size = <1024>;
 
-			brcm,nand-oob-sector-size = <27>;
-		};
+		brcm,nand-oob-sector-size = <27>;
 	};
 };
diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts
index bf62e1b..af11a8e 100644
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -42,8 +42,8 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	uart3: serial@18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
 };
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Broadcom Cygnus device tree changes Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 2/9] ARM: dts: Use label for device nodes in Cygnus dts Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
    Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus Arnd Bergmann <arnd@arndb.de> - 2015-09-18 23:40 +0200
      Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core  bus Ray Jui <rjui@broadcom.com> - 2015-09-19 00:00 +0200
  [PATCH v2 8/9] ARM: dts: Enable NAND support on bcm911360_entphn Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 7/9] ARM: dts: Enable various peripherals on bcm958305k Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Arnd Bergmann <arnd@arndb.de> - 2015-09-18 23:30 +0200
    Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Ray Jui <rjui@broadcom.com> - 2015-09-18 23:50 +0200
  [PATCH v2 6/9] ARM: dts: Reorder Cygnus peripherals Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 9/9] ARM: dts: enable touchscreen support on Cygnus Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200
  [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files Ray Jui <rjui@broadcom.com> - 2015-09-18 23:30 +0200

csiph-web