From a0c0ad728c11751a30bb2c56e9cf54f8d2fe5fd1 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Fri, 10 Jan 2020 23:51:05 +0100 Subject: [PATCH] ipq40xx: fix usbport trigger on the RT-AC58U with USB 2.0 devices This patch partially reverts "ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U" as the change removed the usb2 port-trigger, so the LED would no longer light-up when a USB 2.0 was inserted into the USB port. Fixes: d0efb1ba95f3 ("ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U") Signed-off-by: Christian Lamparter --- .../files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 7 ++++++- .../files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index f046bdcb5e..56725f94c5 100644 --- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -69,6 +69,11 @@ reg = <1>; #trigger-source-cells = <0>; }; + + usb3_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; }; }; @@ -143,7 +148,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>; + trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; }; diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts index 331d8e4d74..a0030f77ce 100644 --- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts +++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts @@ -73,6 +73,11 @@ reg = <1>; #trigger-source-cells = <0>; }; + + usb3_port2: port@2 { + reg = <2>; + #trigger-source-cells = <0>; + }; }; }; @@ -137,7 +142,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>; + trigger-sources = <&usb3_port1>, <&usb3_port2>; linux,default-trigger = "usbport"; };