From bb6d11e53487e397b1c1cec1767b593dd1025c18 Mon Sep 17 00:00:00 2001 From: INAGAKI Hiroshi Date: Mon, 4 Mar 2024 20:28:23 +0900 Subject: [PATCH] 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 --- .../dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 1 - target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts | 1 - target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts | 1 - target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi | 1 - target/linux/ath79/dts/qca9558_mikrotik_routerboard-96x.dtsi | 1 - target/linux/ath79/dts/qca9558_openmesh_a60.dtsi | 1 - target/linux/ath79/dts/qca9558_openmesh_mr.dtsi | 1 - target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts | 1 - target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 1 - target/linux/ath79/dts/qca955x.dtsi | 5 +++++ 10 files changed, 5 insertions(+), 9 deletions(-) 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 485ef30e2c..9ae4dbe2d5 100644 --- 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 febbccb4cb..703eead178 100644 --- 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 = ð1; 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 137bff732c..2d490dcf48 100644 --- 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 bc85cad9b3..c2e1ab765b 100644 --- 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 3cfc40cd86..684ca8632a 100644 --- 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 11a6e81f9f..e908c26c0d 100644 --- 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 a5d3d37987..03f2999083 100644 --- 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 f7c51578ba..8fd35a99d4 100644 --- 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 b9eb0e91a9..2e27d3d6ee 100644 --- 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 c12a266cda..9d410ceb46 100644 --- 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"; };