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

Groups > linux.kernel > #1228292

[PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Show all headers | View raw

Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts
files

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

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index e1ac07a..30903ba 100644
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -40,6 +40,10 @@
 	model = "Broadcom Cygnus SoC";
 	interrupt-parent = <&gic>;
 
+	aliases {
+		serial0 = &uart3;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts
index 7db4843..0e1320e 100644
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -39,10 +39,6 @@
 	model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)";
 	compatible = "brcm,bcm11360", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts
index 9658d4f..2af40c6 100644
--- a/arch/arm/boot/dts/bcm911360k.dts
+++ b/arch/arm/boot/dts/bcm911360k.dts
@@ -38,10 +38,6 @@
 	model = "Cygnus SVK (BCM911360K)";
 	compatible = "brcm,bcm11360", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
index 2f63052..75e50f0 100644
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -38,10 +38,6 @@
 	model = "Cygnus SVK (BCM958300K)";
 	compatible = "brcm,bcm58300", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts
index 56b429a..bf62e1b 100644
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -38,10 +38,6 @@
 	model = "Cygnus Wireless Audio (BCM958305K)";
 	compatible = "brcm,bcm58305", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
-- 
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 | 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