This patch introduces serial0 aliases in the ramips DTS files, which can then be used to denote the active console instead of relying on bootargs.
Signed-off-by: Stanislav Galabov <sgala...@gmail.com> — diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts index 2dfb98c..bb38c88 100644 --- a/target/linux/ramips/dts/LINKIT7688.dts +++ b/target/linux/ramips/dts/LINKIT7688.dts @@ -10,6 +10,10 @@ bootargs = "console=ttyS2,57600"; }; + aliases { + serial0 = &uart2; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x8000000>; diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index 5edbdf9..3c89880 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -23,6 +23,7 @@ aliases { spi0 = &spi0; spi1 = &spi1; + serial0 = &uartlite; }; palmbus@10000000 { @@ -239,7 +240,7 @@ pinctrl-0 = <&spi_cs1>; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index e8ce3b2..7e66abe 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -23,6 +23,7 @@ aliases { spi0 = &spi0; spi1 = &spi1; + serial0 = &uartlite; }; palmbus@10000000 { @@ -191,7 +192,7 @@ pinctrl-0 = <&spi_cs1>; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi index 24e0459..94cff26 100644 --- a/target/linux/ramips/dts/mt7621.dtsi +++ b/target/linux/ramips/dts/mt7621.dtsi @@ -5,6 +5,10 @@ #size-cells = <1>; compatible = "mediatek,mtk7621-soc"; + aliases { + serial0 = &uartlite; + }; + cpus { cpu@0 { compatible = "mips,mips1004Kc"; @@ -100,7 +104,7 @@ reg = <0x1fbf8000 0x8000>; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi index e120e56..c1f03fc 100644 --- a/target/linux/ramips/dts/mt7628an.dtsi +++ b/target/linux/ramips/dts/mt7628an.dtsi @@ -13,6 +13,10 @@ bootargs = "console=ttyS0,57600"; }; + aliases { + serial0 = &uartlite; + }; + cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -154,7 +158,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ns16550a"; reg = <0xc00 0x100>; @@ -192,7 +196,7 @@ status = "disabled"; }; - uart2@e00 { + uart2: uart2@e00 { compatible = "ns16550a"; reg = <0xe00 0x100>; diff --git a/target/linux/ramips/dts/rt2880.dtsi b/target/linux/ramips/dts/rt2880.dtsi index 47ea4c3..dc3f0ba 100644 --- a/target/linux/ramips/dts/rt2880.dtsi +++ b/target/linux/ramips/dts/rt2880.dtsi @@ -13,6 +13,10 @@ bootargs = "console=ttyS0,57600"; }; + aliases { + serial0 = &uartlite; + }; + cpuintc: cpuintc@0 { #address-cells = <0>; #interrupt-cells = <1>; @@ -110,7 +114,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi index 8fcdeed..0a4cf1e 100644 --- a/target/linux/ramips/dts/rt3050.dtsi +++ b/target/linux/ramips/dts/rt3050.dtsi @@ -15,6 +15,7 @@ aliases { spi0 = &spi0; + serial0 = &uartlite; }; cpuintc: cpuintc@0 { @@ -164,7 +165,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,rt3050-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi index 0932b52..f9721d8 100644 --- a/target/linux/ramips/dts/rt3352.dtsi +++ b/target/linux/ramips/dts/rt3352.dtsi @@ -23,6 +23,7 @@ aliases { spi0 = &spi0; spi1 = &spi1; + serial0 = &uartlite; }; palmbus@10000000 { @@ -175,7 +176,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index cd96b74..fa070a1 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -16,6 +16,7 @@ aliases { spi0 = &spi0; spi1 = &spi1; + serial0 = &uartlite; }; cpuintc: cpuintc@0 { @@ -195,7 +196,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,rt3883-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index b8712e9..226d4a4 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -23,6 +23,7 @@ aliases { spi0 = &spi0; spi1 = &spi1; + serial0 = &uartlite; }; palmbus@10000000 { @@ -184,7 +185,7 @@ status = "disabled"; }; - uartlite@c00 { + uartlite: uartlite@c00 { compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a"; reg = <0xc00 0x100>; _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel