| From 940016336f7e0cb0a64cf17aa0a0620597ace52f Mon Sep 17 00:00:00 2001 |
| From: Dinh Nguyen <dinguyen@opensource.altera.com> |
| Date: Tue, 14 Jul 2015 17:19:02 -0500 |
| Subject: [PATCH 24/39] ARM: dts: socfpga: use stdout-path for chosen node |
| |
| Use stdout-path dts property for kernel console. |
| |
| Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> |
| (cherry picked from commit efc1985c8f79ee8259d19a9b6e3df6a07d063669) |
| Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> |
| --- |
| arch/arm/boot/dts/socfpga_arria10.dtsi | 5 +++++ |
| arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 3 ++- |
| arch/arm/boot/dts/socfpga_arria5_socdk.dts | 3 ++- |
| arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 3 ++- |
| arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 3 ++- |
| 5 files changed, 13 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi |
| index f5bebdd6d1be..9f25a92a1e48 100644 |
| --- a/arch/arm/boot/dts/socfpga_arria10.dtsi |
| +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi |
| @@ -21,6 +21,11 @@ |
| #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 94a0709b2fe6..99aa9a1c8af0 100644 |
| --- a/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi |
| +++ b/arch/arm/boot/dts/socfpga_arria10_socdk.dtsi |
| @@ -21,7 +21,8 @@ |
| compatible = "altr,socfpga-arria10", "altr,socfpga"; |
| |
| chosen { |
| - bootargs = "console=ttyS0,115200 rootwait"; |
| + bootargs = "earlyprintk"; |
| + stdout-path = "serial1:115200n8"; |
| }; |
| |
| memory { |
| diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts |
| index ccaf41742fc3..a75a666032b2 100644 |
| --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts |
| +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts |
| @@ -22,7 +22,8 @@ |
| compatible = "altr,socfpga-arria5", "altr,socfpga"; |
| |
| chosen { |
| - bootargs = "console=ttyS0,115200"; |
| + bootargs = "earlyprintk"; |
| + stdout-path = "serial0:115200n8"; |
| }; |
| |
| memory { |
| diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts |
| index 258865da8f6a..d4d0a28fb331 100644 |
| --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts |
| +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts |
| @@ -22,7 +22,8 @@ |
| compatible = "altr,socfpga-cyclone5", "altr,socfpga"; |
| |
| chosen { |
| - bootargs = "console=ttyS0,115200"; |
| + bootargs = "earlyprintk"; |
| + stdout-path = "serial0:115200n8"; |
| }; |
| |
| memory { |
| diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts |
| index 16ea6f5f2ab8..1ab1d6902504 100644 |
| --- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts |
| +++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts |
| @@ -22,7 +22,8 @@ |
| compatible = "altr,socfpga-cyclone5", "altr,socfpga"; |
| |
| chosen { |
| - bootargs = "console=ttyS0,115200"; |
| + bootargs = "earlyprintk"; |
| + stdout-path = "serial0:115200n8"; |
| }; |
| |
| memory { |
| -- |
| 2.6.2 |
| |
