ath79: add aliases to qca955x.dtsi for uart0/1

Add aliases with "serialN = &uartN;" of uart0/1 on QCA955x SoCs to
qca955x.dtsi, to enable uart1 on Linux Kernel.

without this:

[    0.342915] ar933x-uart 18500000.uart: unable to get alias id, err=-19

Additionally, remove "serial0 = &uart;" alias from QCA955x device
dts/dtsi files.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
index 485ef30e2c114ffb5a2608320d2d9e38a19136b4..9ae4dbe2d52e7842451e7756698a185b831f421b 100644 (file)
--- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
+++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
@@ -11,7 +11,6 @@
 
        aliases {
                mdio-gpio1 = &mdio2;
-               serial0 = &uart;
        };
 
        keys {

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
index febbccb4cb4ba0e132e1b4ee9edcea49bfd0694d..703eead178cab68b0c6e8644a8a6dafceb0591e0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
@@ -11,7 +11,6 @@
        model = "COMFAST CF-E380AC";
 
        aliases {
-               serial0 = &uart;
                label-mac-device = &eth1;
                led-boot = &led_lan;
                led-failsafe = &led_lan;

diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
index 137bff732cf8b6391e6cd4685df7ef48f7004094..2d490dcf4809a1737b297757f4fc99cf7ae381ae 100644 (file)
--- a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts
@@ -16,7 +16,6 @@
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
-               serial0 = &uart;
        };
 
        keys {

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
index bc85cad9b37b0327d53f02d6740f35a2d13ae195..c2e1ab765b141362bf0fb5e0d70414776fbf79d7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi
@@ -10,7 +10,6 @@
                led-boot = &led_user;
                led-failsafe = &led_user;
                led-upgrade = &led_user;
-               serial0 = &uart;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-96x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-96x.dtsi
index 3cfc40cd86cef11fd99095114e9652942edc0084..684ca8632a4852dd6227e1db544bb9828956807d 100644 (file)
--- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-96x.dtsi
+++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-96x.dtsi
@@ -10,7 +10,6 @@
                led-boot = &led_user;
                led-failsafe = &led_user;
                led-upgrade = &led_user;
-               serial0 = &uart;
        };
 
        leds {

diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index 11a6e81f9f28f4cab2f62323cdb07719f374e688..e908c26c0db87b509524b4fd114da9509a226ec4 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -12,7 +12,6 @@
        };
 
        aliases {
-               serial0 = &uart;
                led-boot = &led_status_green;
                led-failsafe = &led_status_green;
                led-running = &led_status_green;

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index a5d3d3798788cb78a557469d5842307a3ff0f222..03f2999083b36a7b9ba0759fe9504889c5ead909 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -12,7 +12,6 @@
        };
 
        aliases {
-               serial0 = &uart;
                led-boot = &led_power_blue;
                led-failsafe = &led_power_blue;
                led-running = &led_power_blue;

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
index f7c51578ba9aa69d1965e225fe7bcadb4a22b3b0..8fd35a99d4d388fd031689c178e54748774ee120 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
@@ -15,7 +15,6 @@
        };
 
        aliases {
-               serial0 = &uart;
                led-boot = &led_power_blue;
                led-failsafe = &led_power_blue;
                led-running = &led_power_blue;

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index b9eb0e91a9b6ad2cc1e0cb446ae28e955f8fc96c..2e27d3d6ee5f6d93bdc310af04c9b93759d042a3 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -15,7 +15,6 @@
        };
 
        aliases {
-               serial0 = &uart;
                led-boot = &led_power_blue;
                led-failsafe = &led_power_blue;
                led-running = &led_power_blue;

diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index c12a266cda073e4ade54755c4619cc965cef90b9..9d410ceb461cbfdee5196ee494978ac8ca74ceaa 100644 (file)
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -8,6 +8,11 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        chosen {
                bootargs = "console=ttyS0,115200n8";
        };