From: Sungbo Eo Date: Sat, 21 Dec 2019 12:43:24 +0000 (+0900) Subject: ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U X-Git-Tag: v21.02.0-rc1~4305 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d0efb1ba95f34b70dca759b6cfeb854be43a4edf;p=openwrt%2Fopenwrt.git ipq40xx: remove unnecessary usb nodes in DTS for ASUS RT-AC58U RT-AC58U has single USB 3.0 port, and only usb3_port1 is actually used. Signed-off-by: Sungbo Eo --- 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 4e5559386e..f046bdcb5e 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 @@ -58,20 +58,6 @@ qcom,wifi_noc_memtype_m0_m2 = ; }; - usb2@60f8800 { - status = "okay"; - - dwc3@6000000 { - #address-cells = <1>; - #size-cells = <0>; - - usb2_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - }; - }; - usb3@8af8800 { status = "okay"; @@ -83,11 +69,6 @@ reg = <1>; #trigger-source-cells = <0>; }; - - usb3_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; }; }; @@ -162,7 +143,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; + trigger-sources = <&usb3_port1>; linux,default-trigger = "usbport"; }; @@ -316,7 +297,3 @@ &usb3_hs_phy { status = "okay"; }; - -&usb2_hs_phy { - status = "okay"; -}; 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 a569a158fd..331d8e4d74 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 @@ -62,20 +62,6 @@ qcom,wifi_noc_memtype_m0_m2 = ; }; - usb2@60f8800 { - status = "okay"; - - dwc3@6000000 { - #address-cells = <1>; - #size-cells = <0>; - - usb2_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - }; - }; - usb3@8af8800 { status = "okay"; @@ -87,11 +73,6 @@ reg = <1>; #trigger-source-cells = <0>; }; - - usb3_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; }; }; @@ -156,7 +137,7 @@ usb { label = "rt-ac58u:blue:usb"; gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>; - trigger-sources = <&usb3_port1>, <&usb3_port2>, <&usb2_port1>; + trigger-sources = <&usb3_port1>; linux,default-trigger = "usbport"; }; @@ -312,10 +293,6 @@ status = "okay"; }; -&usb2_hs_phy { - status = "okay"; -}; - &wifi0 { status = "okay"; qcom,ath10k-calibration-variant = "RT-AC58U";