ARM: dts: socfpga: fix definitions of serial console

The notion of which uart instance is serial0 or serial1
is board specific rather than generic to the chip. This
patch removes the serial aliases from generic chip dtsi
and adds an appropriate alias to the board specific dtsi.
By making the alias for serial0 point to uart1 for the arria10_socdk,
the linux boot command line supports specifying console=ttyS0,115200
for backwards compatibility, and it supports not specifying
the console at all.

Signed-off-by: Matthew Gerlach <mgerlach@opensource.altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>

diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
index 21f6c3ce2c524c8ad7b39a024bce2eb944269303..1c4fc275c661cbcb39abe74c10930dfdf20ff3fa 100644 (file)
--- a/arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
@@ -22,11 +22,6 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       aliases {
-               serial0 = &uart0;
-               serial1 = &uart1;
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
index ab33ee3cc8c31931a7abeda3842d62c60f47602b..8e3a4adc389f5b105f94437ded33e238fe64708e 100644 (file)
--- a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
+++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
@@ -22,11 +22,12 @@
 
        aliases {
                ethernet0 = &gmac0;
+               serial0 = &uart1;
        };
 
        chosen {
                bootargs = "earlyprintk";
-               stdout-path = "serial1:115200n8";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {