From b8f73d7f0a1ddc0c0070eef05a017037b1d4b8da Mon Sep 17 00:00:00 2001
From: Stanislav Galabov <stanislav_galabov@smartcom.bg>
Date: Mon, 9 May 2016 07:20:02 +0300
Subject: [PATCH] ramips: introduce serial0 aliases
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 <sgalabov@gmail.com>
---
target/linux/ramips/dts/LINKIT7688.dts | 4 ++++
target/linux/ramips/dts/mt7620a.dtsi | 3 ++-
target/linux/ramips/dts/mt7620n.dtsi | 3 ++-
target/linux/ramips/dts/mt7621.dtsi | 6 +++++-
target/linux/ramips/dts/mt7628an.dtsi | 8 ++++++--
target/linux/ramips/dts/rt2880.dtsi | 6 +++++-
target/linux/ramips/dts/rt3050.dtsi | 3 ++-
target/linux/ramips/dts/rt3352.dtsi | 3 ++-
target/linux/ramips/dts/rt3883.dtsi | 3 ++-
target/linux/ramips/dts/rt5350.dtsi | 3 ++-
10 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 2dfb98c12e..bb38c88460 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 5edbdf9a90..3c89880746 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 e8ce3b2372..7e66abe4fd 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 24e0459666..c055285bc6 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -22,6 +22,10 @@
compatible = "mti,cpu-interrupt-controller";
};
+ aliases {
+ serial0 = &uartlite;
+ };
+
cpuclock: cpuclock@0 {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -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 e120e56cf4..c1f03fc76c 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 47ea4c343e..dc3f0ba99f 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 8fcdeedd2e..0a4cf1e485 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 0932b52406..f9721d89e0 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 cd96b74bc7..fa070a1ec9 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 b8712e9849..226d4a401f 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>;
--
GitLab