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>

diff --git a/arch/mips/boot/dts/mti/sead3.dts b/arch/mips/boot/dts/mti/sead3.dts
index 1bf58f8..f327791 100644 (file)
--- a/arch/mips/boot/dts/mti/sead3.dts
+++ b/arch/mips/boot/dts/mti/sead3.dts
@@ -14,12 +14,12 @@
        interrupt-parent = <&gic>;
 
        chosen {
-               stdout-path = "uart1:115200";
+               stdout-path = "serial1:115200";
        };
 
        aliases {
-               uart0 = &uart0;
-               uart1 = &uart1;
+               serial0 = &uart0;
+               serial1 = &uart1;
        };
 
        cpus {

diff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c
index 8e36a5b..6077bca 100644 (file)
--- 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));