[PATCH RESEND linux-next v4.1 3/4] arm64: dts: meson: move usb-hub node under dwc3 node on Odroid C4

From: Anand Moon
Date: Wed Jan 25 2023 - 09:35:00 EST


Move the usb-hub node under dwc3 node and drop superfluous
dr_mode as it is the default in meson-g12-common.dtsi.

Fixes: 71593b2020b3 ("arm64: dts: amlogic: Used onboard usb hub reset on odroid c4")
Signed-off-by: Anand Moon <linux.amoon@xxxxxxxxx>
---
.../boot/dts/amlogic/meson-sm1-odroid-c4.dts | 41 +++++++++----------
1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
index d04768a66bfe..a988015dd2d5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts
@@ -26,30 +26,29 @@ led-blue {
sound {
model = "ODROID-C4";
};
+};

+&dwc3 {
/* USB hub supports both USB 2.0 and USB 3.0 root hub */
- usb-hub {
- dr_mode = "host";
- #address-cells = <1>;
- #size-cells = <0>;
-
- /* 2.0 hub on port 1 */
- hub_2_0: hub@1 {
- compatible = "usb2109,2817";
- reg = <1>;
- peer-hub = <&hub_3_0>;
- reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
- vdd-supply = <&vcc_5v>;
- };
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ /* 2.0 hub on port 1 */
+ hub_2_0: hub@1 {
+ compatible = "usb2109,2817";
+ reg = <1>;
+ peer-hub = <&hub_3_0>;
+ reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
+ vdd-supply = <&vcc_5v>;
+ };

- /* 3.1 hub on port 4 */
- hub_3_0: hub@2 {
- compatible = "usb2109,817";
- reg = <2>;
- peer-hub = <&hub_2_0>;
- reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
- vdd-supply = <&vcc_5v>;
- };
+ /* 3.1 hub on port 4 */
+ hub_3_0: hub@2 {
+ compatible = "usb2109,817";
+ reg = <2>;
+ peer-hub = <&hub_2_0>;
+ reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
+ vdd-supply = <&vcc_5v>;
};
};

--
2.38.1