* [PATCH] ARM: dts: move aliases back to .dts in Cygnus
@ 2015-09-24 22:21 Ray Jui
2015-09-25 1:30 ` Florian Fainelli
0 siblings, 1 reply; 2+ messages in thread
From: Ray Jui @ 2015-09-24 22:21 UTC (permalink / raw)
To: linux-arm-kernel
Move aliases from bcm-cygnus.dtsi back to individual .dts files. Also
clean up the chosen node to have the stdout-path using the proper alias
Signed-off-by: Ray Jui <rjui@broadcom.com>
---
arch/arm/boot/dts/bcm-cygnus.dtsi | 4 ----
arch/arm/boot/dts/bcm911360k.dts | 7 +++++--
arch/arm/boot/dts/bcm958300k.dts | 7 +++++--
arch/arm/boot/dts/bcm958305k.dts | 7 +++++--
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index b5f9f34..2778533 100644
--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -41,10 +41,6 @@
model = "Broadcom Cygnus SoC";
interrupt-parent = <&gic>;
- aliases {
- serial0 = &uart3;
- };
-
cpus {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/bcm911360k.dts b/arch/arm/boot/dts/bcm911360k.dts
index 814011c..091c73a 100644
--- a/arch/arm/boot/dts/bcm911360k.dts
+++ b/arch/arm/boot/dts/bcm911360k.dts
@@ -38,9 +38,12 @@
model = "Cygnus SVK (BCM911360K)";
compatible = "brcm,bcm11360", "brcm,cygnus";
+ aliases {
+ serial0 = &uart3;
+ };
+
chosen {
- stdout-path = &uart3;
- bootargs = "console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts
index 2e31581..b4a1392 100644
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -39,9 +39,12 @@
model = "Cygnus SVK (BCM958300K)";
compatible = "brcm,bcm58300", "brcm,cygnus";
+ aliases {
+ serial0 = &uart3;
+ };
+
chosen {
- stdout-path = &uart3;
- bootargs = "console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts
index 288a637..3378683 100644
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -39,9 +39,12 @@
model = "Cygnus Wireless Audio (BCM958305K)";
compatible = "brcm,bcm58305", "brcm,cygnus";
+ aliases {
+ serial0 = &uart3;
+ };
+
chosen {
- stdout-path = &uart3;
- bootargs = "console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: dts: move aliases back to .dts in Cygnus
2015-09-24 22:21 [PATCH] ARM: dts: move aliases back to .dts in Cygnus Ray Jui
@ 2015-09-25 1:30 ` Florian Fainelli
0 siblings, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2015-09-25 1:30 UTC (permalink / raw)
To: linux-arm-kernel
On 24/09/15 15:21, Ray Jui wrote:
> Move aliases from bcm-cygnus.dtsi back to individual .dts files. Also
> clean up the chosen node to have the stdout-path using the proper alias
>
> Signed-off-by: Ray Jui <rjui@broadcom.com>
Applied to devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-25 1:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 22:21 [PATCH] ARM: dts: move aliases back to .dts in Cygnus Ray Jui
2015-09-25 1:30 ` Florian Fainelli
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).