From: rjui@broadcom.com (Ray Jui)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/9] ARM: dts: consolidate aliases for Cygnus dt files
Date: Mon, 21 Sep 2015 15:12:42 -0700 [thread overview]
Message-ID: <1442873570-20947-2-git-send-email-rjui@broadcom.com> (raw)
In-Reply-To: <1442873570-20947-1-git-send-email-rjui@broadcom.com>
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
next prev parent reply other threads:[~2015-09-21 22:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-21 22:12 [PATCH v3 0/9] Broadcom Cygnus device tree changes Ray Jui
2015-09-21 22:12 ` Ray Jui [this message]
2015-09-21 22:12 ` [PATCH v3 2/9] ARM: dts: Use label for device nodes in Cygnus dts Ray Jui
2015-09-21 22:12 ` [PATCH v3 3/9] ARM: dts: Put Cygnus core components under core bus Ray Jui
2015-09-21 22:12 ` [PATCH v3 4/9] ARM: dts: Move all Cygnus peripherals into axi bus Ray Jui
2015-09-21 22:12 ` [PATCH v3 5/9] ARM: dts: Reorder Cygnus peripherals Ray Jui
2015-09-21 22:12 ` [PATCH v3 6/9] ARM: dts: Enable various peripherals on bcm958305k Ray Jui
2015-09-21 22:12 ` [PATCH v3 7/9] ARM: dts: Enable NAND support on bcm911360_entphn Ray Jui
2015-09-21 22:12 ` [PATCH v3 8/9] ARM: dts: enable touchscreen support on Cygnus Ray Jui
2015-09-21 22:12 ` [PATCH v3 9/9] ARM: dts: fix Cygnus nand device node Ray Jui
2015-09-23 0:58 ` [PATCH v3 0/9] Broadcom Cygnus device tree changes Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442873570-20947-2-git-send-email-rjui@broadcom.com \
--to=rjui@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).