hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
....@@ -112,7 +112,7 @@
112112 };
113113
114114 &emac {
115
- phy = <&phy1>;
115
+ phy-handle = <&phy1>;
116116 status = "okay";
117117 };
118118
....@@ -186,18 +186,6 @@
186186 function = "gpio_out";
187187 drive-strength = <20>;
188188 };
189
-
190
- usb0_id_detect_pin: usb0-id-detect-pin {
191
- pins = "PH4";
192
- function = "gpio_in";
193
- bias-pull-up;
194
- };
195
-
196
- usb0_vbus_detect_pin: usb0-vbus-detect-pin {
197
- pins = "PH5";
198
- function = "gpio_in";
199
- bias-pull-down;
200
- };
201189 };
202190
203191 &reg_ahci_5v {
....@@ -229,10 +217,8 @@
229217 };
230218
231219 &usbphy {
232
- pinctrl-names = "default";
233
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
234
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
235
- usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
220
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
221
+ usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */
236222 usb0_vbus-supply = <&reg_usb0_vbus>;
237223 usb1_vbus-supply = <&reg_usb1_vbus>;
238224 usb2_vbus-supply = <&reg_usb2_vbus>;