hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
....@@ -114,7 +114,7 @@
114114 };
115115
116116 &emac {
117
- phy = <&phy1>;
117
+ phy-handle = <&phy1>;
118118 status = "okay";
119119 };
120120
....@@ -184,12 +184,6 @@
184184 function = "gpio_out";
185185 drive-strength = <20>;
186186 };
187
-
188
- usb0_id_detect_pin: usb0-id-detect-pin {
189
- pins = "PH4";
190
- function = "gpio_in";
191
- bias-pull-up;
192
- };
193187 };
194188
195189 &reg_ahci_5v {
....@@ -254,9 +248,7 @@
254248 };
255249
256250 &usbphy {
257
- pinctrl-names = "default";
258
- pinctrl-0 = <&usb0_id_detect_pin>;
259
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
251
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
260252 usb1_vbus-supply = <&reg_usb1_vbus>;
261253 usb2_vbus-supply = <&reg_usb2_vbus>;
262254 status = "okay";