diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2014-04-05 14:00:22 +0400 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2014-04-05 17:06:51 +0400 |
| commit | 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb (patch) | |
| tree | 7d09af294659c32a6deffe0c28aba1e2d04c48ce /arch/arc | |
| parent | 6eda477b3c54b8236868c8784e5e042ff14244f0 (diff) | |
| download | linux-61fb4bfc010b0d2940f7fd87acbce6a0f03217cb.tar.xz | |
ARC: [nsimosci] Unbork console
Despite the switch to right UART driver (prev patch), serial console
still doesn't work due to missing CONFIG_SERIAL_OF_PLATFORM
Also fix the default cmdline in DT to not refer to out-of-tree
ARC framebuffer driver for console.
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: <stable@vger.kernel.org> #3.10, 3.12, 3.13, 3.14
Cc: Francois Bedard <Francois.Bedard@synopsys.com>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 5 | ||||
| -rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts index 8bd238c34c7d..4f31b2eb5cdf 100644 --- a/arch/arc/boot/dts/nsimosci.dts +++ b/arch/arc/boot/dts/nsimosci.dts @@ -17,7 +17,10 @@ interrupt-parent = <&intc>; chosen { - bootargs = "console=tty0 consoleblank=0"; + /* this is for console on PGU */ + /* bootargs = "console=tty0 consoleblank=0"; */ + /* this is for console on serial */ + bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug"; }; aliases { diff --git a/arch/arc/configs/nsimosci_defconfig b/arch/arc/configs/nsimosci_defconfig index 451af30914f6..c01ba35a4eff 100644 --- a/arch/arc/configs/nsimosci_defconfig +++ b/arch/arc/configs/nsimosci_defconfig @@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_ARC=y CONFIG_SERIAL_ARC_CONSOLE=y # CONFIG_HW_RANDOM is not set |