summaryrefslogtreecommitdiffstats
path: root/arch/mips/generic
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-06-02 12:29:53 -0700
committerRalf Baechle <ralf@linux-mips.org>2017-06-28 12:22:41 +0200
commitc3d62fc6a058d1024f3ad0525a251e9d6c5203ed (patch)
tree2a8548691b044298ccd83986b8daaf1d8e95124b /arch/mips/generic
parentf41d2430bbd6b64ee934915a1856fa406677d55e (diff)
downloadlinux-stable-c3d62fc6a058d1024f3ad0525a251e9d6c5203ed.tar.gz
linux-stable-c3d62fc6a058d1024f3ad0525a251e9d6c5203ed.tar.bz2
linux-stable-c3d62fc6a058d1024f3ad0525a251e9d6c5203ed.zip
MIPS: generic/yamon-dt: Use serial* rather than uart* aliases
Name aliases in the SEAD-3 device tree serial0 & serial1, rather than uart0 & uart1. This allows the core serial code to make use of the aliases to ensure that the UARTs are consistently numbered as expected rather than having the numbering depend upon probe order. When translating YAMON-provided serial configuration to a device tree stdout-path property adjust accordingly, such that we continue to reference a valid alias. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16183/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/generic')
-rw-r--r--arch/mips/generic/yamon-dt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c
index 8e36a5baaa7e..6077bca9b364 100644
--- a/arch/mips/generic/yamon-dt.c
+++ b/arch/mips/generic/yamon-dt.c
@@ -163,7 +163,7 @@ __init int yamon_dt_append_memory(void *fdt,
__init int yamon_dt_serial_config(void *fdt)
{
const char *yamontty, *mode_var;
- char mode_var_name[9], path[18], parity;
+ char mode_var_name[9], path[20], parity;
unsigned int uart, baud, stop_bits;
bool hw_flow;
int chosen_off, err;
@@ -214,7 +214,7 @@ __init int yamon_dt_serial_config(void *fdt)
if (stop_bits != 7 && stop_bits != 8)
stop_bits = 8;
- WARN_ON(snprintf(path, sizeof(path), "uart%u:%u%c%u%s",
+ WARN_ON(snprintf(path, sizeof(path), "serial%u:%u%c%u%s",
uart, baud, parity, stop_bits,
hw_flow ? "r" : "") >= sizeof(path));