Skip to content

Commit 3fe162a

Browse files
Venkatesh Yadav Abbarapumichalsimek
Venkatesh Yadav Abbarapu
authored and
michalsimek
committed
arm64: zynqmp: Update the usb5744 hub node as per binding
Updating the usb5744 hub node as per the latest upstream DT binding https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ tree/Documentation/devicetree/bindings/usb/microchip,usb5744.yaml?h=v6.8.8 Signed-off-by: Venkatesh Yadav Abbarapu <[email protected]> State: pending
1 parent 7f9701d commit 3fe162a

File tree

5 files changed

+162
-43
lines changed

5 files changed

+162
-43
lines changed

‎arch/arm64/boot/dts/xilinx/zynqmp-sck-kd-g-revA.dtso‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
"", "";
8181
};
8282

83-
/* usb5744@2d */
83+
hub: usb-hub@2d { /* u36 */
84+
compatible = "microchip,usb5744";
85+
reg = <0x2d>;
86+
};
8487
};
8588

8689
/* USB 3.0 */
@@ -100,12 +103,6 @@
100103
reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
101104
assigned-clock-rates = <250000000>, <20000000>;
102105

103-
usbhub0: usb-hub { /* u36 */
104-
i2c-bus = <&i2c1>;
105-
compatible = "microchip,usb5744";
106-
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
107-
};
108-
109106
usb2244: usb-sd { /* u41 */
110107
compatible = "microchip,usb2244";
111108
reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
@@ -117,6 +114,26 @@
117114
dr_mode = "host";
118115
snps,usb3_lpm_capable;
119116
maximum-speed = "super-speed";
117+
#address-cells = <1>;
118+
#size-cells = <0>;
119+
120+
/* 2.0 hub on port 1 */
121+
hub_2_0: hub@1 {
122+
compatible = "usb424,2744";
123+
reg = <1>;
124+
peer-hub = <&hub_3_0>;
125+
i2c-bus = <&hub>;
126+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
127+
};
128+
129+
/* 3.0 hub on port 2 */
130+
hub_3_0: hub@2 {
131+
compatible = "usb424,5744";
132+
reg = <2>;
133+
peer-hub = <&hub_2_0>;
134+
i2c-bus = <&hub>;
135+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
136+
};
120137
};
121138

122139
&gem1 { /* mdio mio50/51 */

‎arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,19 @@
105105
#address-cells = <1>;
106106
#size-cells = <0>;
107107
reg = <0>;
108+
hub_1: usb-hub@2d {
109+
compatible = "microchip,usb5744";
110+
reg = <0x2d>;
111+
};
108112
};
109113
usbhub_i2c1: i2c@1 {
110114
#address-cells = <1>;
111115
#size-cells = <0>;
112116
reg = <1>;
117+
hub_2: usb-hub@2d {
118+
compatible = "microchip,usb5744";
119+
reg = <0x2d>;
120+
};
113121
};
114122
/* Bus 2/3 are not connected */
115123
};
@@ -146,12 +154,6 @@
146154
reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
147155
assigned-clock-rates = <250000000>, <20000000>;
148156

149-
usbhub0: usb-hub { /* u43 */
150-
i2c-bus = <&usbhub_i2c0>;
151-
compatible = "microchip,usb5744";
152-
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
153-
};
154-
155157
usb2244: usb-sd { /* u38 */
156158
compatible = "microchip,usb2244";
157159
reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
@@ -163,6 +165,26 @@
163165
dr_mode = "host";
164166
snps,usb3_lpm_capable;
165167
maximum-speed = "super-speed";
168+
#address-cells = <1>;
169+
#size-cells = <0>;
170+
171+
/* 2.0 hub on port 1 */
172+
hub_2_0: hub@1 {
173+
compatible = "usb424,2744";
174+
reg = <1>;
175+
peer-hub = <&hub_3_0>;
176+
i2c-bus = <&hub_1>;
177+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
178+
};
179+
180+
/* 3.0 hub on port 2 */
181+
hub_3_0: hub@2 {
182+
compatible = "usb424,5744";
183+
reg = <2>;
184+
peer-hub = <&hub_2_0>;
185+
i2c-bus = <&hub_1>;
186+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
187+
};
166188
};
167189

168190
&usb1 { /* mio64 - mio75 */
@@ -173,19 +195,33 @@
173195
phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
174196
reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
175197
assigned-clock-rates = <250000000>, <20000000>;
176-
177-
usbhub1: usb-hub { /* u84 */
178-
i2c-bus = <&usbhub_i2c1>;
179-
compatible = "microchip,usb5744";
180-
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
181-
};
182198
};
183199

184200
&dwc3_1 {
185201
status = "okay";
186202
dr_mode = "host";
187203
snps,usb3_lpm_capable;
188204
maximum-speed = "super-speed";
205+
#address-cells = <1>;
206+
#size-cells = <0>;
207+
208+
/* 2.0 hub on port 1 */
209+
hub1_2_0: hub@1 {
210+
compatible = "usb424,2744";
211+
reg = <1>;
212+
peer-hub = <&hub1_3_0>;
213+
i2c-bus = <&hub_2>;
214+
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
215+
};
216+
217+
/* 3.0 hub on port 2 */
218+
hub1_3_0: hub@2 {
219+
compatible = "usb424,5744";
220+
reg = <2>;
221+
peer-hub = <&hub1_2_0>;
222+
i2c-bus = <&hub_2>;
223+
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
224+
};
189225
};
190226

191227
&gem0 { /* mdio mio50/51 */

‎arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,19 @@
105105
#address-cells = <1>;
106106
#size-cells = <0>;
107107
reg = <0>;
108+
hub_1: usb-hub@2d {
109+
compatible = "microchip,usb5744";
110+
reg = <0x2d>;
111+
};
108112
};
109113
usbhub_i2c1: i2c@1 {
110114
#address-cells = <1>;
111115
#size-cells = <0>;
112116
reg = <1>;
117+
hub_2: usb-hub@2d {
118+
compatible = "microchip,usb5744";
119+
reg = <0x2d>;
120+
};
113121
};
114122
/* Bus 2/3 are not connected */
115123
};
@@ -146,12 +154,6 @@
146154
reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;
147155
assigned-clock-rates = <250000000>, <20000000>;
148156

149-
usbhub0: usb-hub { /* u43 */
150-
i2c-bus = <&usbhub_i2c0>;
151-
compatible = "microchip,usb5744";
152-
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
153-
};
154-
155157
usb2244: usb-sd { /* u38 */
156158
compatible = "microchip,usb2244";
157159
reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>;
@@ -163,6 +165,26 @@
163165
dr_mode = "host";
164166
snps,usb3_lpm_capable;
165167
maximum-speed = "super-speed";
168+
#address-cells = <1>;
169+
#size-cells = <0>;
170+
171+
/* 2.0 hub on port 1 */
172+
hub_2_0: hub@1 {
173+
compatible = "usb424,2744";
174+
reg = <1>;
175+
peer-hub = <&hub_3_0>;
176+
i2c-bus = <&hub_1>;
177+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
178+
};
179+
180+
/* 3.0 hub on port 2 */
181+
hub_3_0: hub@2 {
182+
compatible = "usb424,5744";
183+
reg = <2>;
184+
peer-hub = <&hub_2_0>;
185+
i2c-bus = <&hub_1>;
186+
reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>;
187+
};
166188
};
167189

168190
&usb1 { /* mio64 - mio75 */
@@ -173,19 +195,33 @@
173195
phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;
174196
reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;
175197
assigned-clock-rates = <250000000>, <20000000>;
176-
177-
usbhub1: usb-hub { /* u84 */
178-
i2c-bus = <&usbhub_i2c1>;
179-
compatible = "microchip,usb5744";
180-
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
181-
};
182198
};
183199

184200
&dwc3_1 {
185201
status = "okay";
186202
dr_mode = "host";
187203
snps,usb3_lpm_capable;
188204
maximum-speed = "super-speed";
205+
#address-cells = <1>;
206+
#size-cells = <0>;
207+
208+
/* 2.0 hub on port 1 */
209+
hub1_2_0: hub@1 {
210+
compatible = "usb424,2744";
211+
reg = <1>;
212+
peer-hub = <&hub1_3_0>;
213+
i2c-bus = <&hub_2>;
214+
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
215+
};
216+
217+
/* 3.0 hub on port 2 */
218+
hub1_3_0: hub@2 {
219+
compatible = "usb424,5744";
220+
reg = <2>;
221+
peer-hub = <&hub1_2_0>;
222+
i2c-bus = <&hub_2>;
223+
reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>;
224+
};
189225
};
190226

191227
&gem0 { /* mdio mio50/51 */

‎arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,31 @@
129129
pinctrl-0 = <&pinctrl_usb0_default>;
130130
phy-names = "usb3-phy";
131131
phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
132-
usbhub: usb5744 { /* u43 */
133-
compatible = "microchip,usb5744";
134-
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
135-
};
136132
};
137133

138134
&dwc3_0 {
139135
status = "okay";
140136
dr_mode = "host";
141137
snps,usb3_lpm_capable;
142138
maximum-speed = "super-speed";
139+
#address-cells = <1>;
140+
#size-cells = <0>;
141+
142+
/* 2.0 hub on port 1 */
143+
hub_2_0: hub@1 {
144+
compatible = "usb424,2744";
145+
reg = <1>;
146+
peer-hub = <&hub_3_0>;
147+
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
148+
};
149+
150+
/* 3.0 hub on port 2 */
151+
hub_3_0: hub@2 {
152+
compatible = "usb424,5744";
153+
reg = <2>;
154+
peer-hub = <&hub_2_0>;
155+
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
156+
};
143157
};
144158

145159
&sdhci1 { /* on CC with tuned parameters */

‎arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
label = "ina260-u14";
8181
reg = <0x40>;
8282
};
83-
/* u43 - 0x2d - USB hub */
83+
hub: usb-hub@2d {
84+
compatible = "microchip,usb5744";
85+
reg = <0x2d>;
86+
};
8487
/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */
8588
};
8689

@@ -111,20 +114,33 @@
111114
phy-names = "usb3-phy";
112115
phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;
113116
assigned-clock-rates = <250000000>, <20000000>;
114-
115-
usb5744: usb-hub { /* u43 */
116-
status = "okay";
117-
compatible = "microchip,usb5744";
118-
i2c-bus = <&i2c1>;
119-
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
120-
};
121117
};
122118

123119
&dwc3_0 {
124120
status = "okay";
125121
dr_mode = "host";
126122
snps,usb3_lpm_capable;
127123
maximum-speed = "super-speed";
124+
#address-cells = <1>;
125+
#size-cells = <0>;
126+
127+
/* 2.0 hub on port 1 */
128+
hub_2_0: hub@1 {
129+
compatible = "usb424,2744";
130+
reg = <1>;
131+
peer-hub = <&hub_3_0>;
132+
i2c-bus = <&hub>;
133+
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
134+
};
135+
136+
/* 3.0 hub on port 2 */
137+
hub_3_0: hub@2 {
138+
compatible = "usb424,5744";
139+
reg = <2>;
140+
peer-hub = <&hub_2_0>;
141+
i2c-bus = <&hub>;
142+
reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
143+
};
128144
};
129145

130146
&sdhci1 { /* on CC with tuned parameters */

0 commit comments

Comments
 (0)