hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/arch/arm/boot/dts/sun4i-a10-marsboard.dts
....@@ -105,7 +105,7 @@
105105 };
106106
107107 &emac {
108
- phy = <&phy1>;
108
+ phy-handle = <&phy1>;
109109 status = "okay";
110110 };
111111
....@@ -148,14 +148,6 @@
148148 status = "okay";
149149 };
150150
151
-&pio {
152
- usb0_id_detect_pin: usb0-id-detect-pin {
153
- pins = "PH4";
154
- function = "gpio_in";
155
- bias-pull-up;
156
- };
157
-};
158
-
159151 &reg_usb1_vbus {
160152 status = "okay";
161153 };
....@@ -183,9 +175,7 @@
183175 };
184176
185177 &usbphy {
186
- pinctrl-names = "default";
187
- pinctrl-0 = <&usb0_id_detect_pin>;
188
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
178
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
189179 usb1_vbus-supply = <&reg_usb1_vbus>;
190180 usb2_vbus-supply = <&reg_usb2_vbus>;
191181 status = "okay";