Permalink
Browse files

ARM: dts: socfpga: fix definitions of serial console for Arria10

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>
  • Loading branch information...
1 parent 12ff492 commit 8b4890ed684b422689394156f8a555d522aaf5db Matthew Gerlach committed with Dinh Nguyen May 12, 2016
Showing with 2 additions and 6 deletions.
  1. +0 −5 arch/arm/boot/dts/socfpga_arria10.dtsi
  2. +2 −1 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
@@ -22,11 +22,6 @@
#address-cells = <1>;
#size-cells = <1>;
- aliases {
- serial0 = &uart0;
- serial1 = &uart1;
- };
-
cpus {
#address-cells = <1>;
#size-cells = <0>;
@@ -22,11 +22,12 @@
aliases {
ethernet0 = &gmac0;
+ serial0 = &uart1;
};
chosen {
bootargs = "earlyprintk";
- stdout-path = "serial1:115200n8";
+ stdout-path = "serial0:115200n8";
};
memory {

0 comments on commit 8b4890e

Please sign in to comment.