hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
....@@ -146,20 +146,6 @@
146146 status = "okay";
147147 };
148148
149
-&pio {
150
- usb0_id_detect_pin: usb0-id-detect-pin {
151
- pins = "PH4";
152
- function = "gpio_in";
153
- bias-pull-up;
154
- };
155
-
156
- usb0_vbus_detect_pin: usb0-vbus-detect-pin {
157
- pins = "PH5";
158
- function = "gpio_in";
159
- bias-pull-down;
160
- };
161
-};
162
-
163149 &pwm {
164150 pinctrl-names = "default";
165151 pinctrl-0 = <&pwm0_pin>;
....@@ -211,10 +197,8 @@
211197 };
212198
213199 &usbphy {
214
- pinctrl-names = "default";
215
- pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
216
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
217
- usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
200
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
201
+ usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
218202 usb0_vbus-supply = <&reg_usb0_vbus>;
219203 usb1_vbus-supply = <&reg_usb1_vbus>;
220204 status = "okay";