forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/sun4i-a10-pcduino.dts
....@@ -110,7 +110,7 @@
110110 };
111111
112112 &emac {
113
- phy = <&phy1>;
113
+ phy-handle = <&phy1>;
114114 status = "okay";
115115 };
116116
....@@ -154,14 +154,6 @@
154154 status = "okay";
155155 };
156156
157
-&pio {
158
- usb0_id_detect_pin: usb0-id-detect-pin {
159
- pins = "PH4";
160
- function = "gpio_in";
161
- bias-pull-up;
162
- };
163
-};
164
-
165157 #include "axp209.dtsi"
166158
167159 &reg_dcdc2 {
....@@ -201,9 +193,7 @@
201193 };
202194
203195 &usbphy {
204
- pinctrl-names = "default";
205
- pinctrl-0 = <&usb0_id_detect_pin>;
206
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
196
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
207197 usb1_vbus-supply = <&reg_vcc5v0>; /* USB1 VBUS is always on */
208198 usb2_vbus-supply = <&reg_vcc5v0>; /* USB2 VBUS is always on */
209199 status = "okay";