ARM: dts: move aliases back to .dts in Cygnus

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>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi
index b5f9f34183fe309b4493243be18f7b005b042fd3..2778533502d9b7fcfdc1ac4ef074fafdd274c012 100644 (file)
--- 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 814011c331d06e7525b0f27dc167b691c247e332..091c73a46e08bb5dccf15642820c843fe34984ac 100644 (file)
--- 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 2e31581dc25e3cb0b5ed79982ddd52acc55c1463..b4a1392bd5a6c6f2b59761164171242188539d90 100644 (file)
--- 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 288a637abf3bcc061c4e4a67627993fbcef71489..3378683321d3c88dcb0edab34a05cfe546cc5ac2 100644 (file)
--- 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";
        };
 };