forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f 
 kernel/arch/arm/boot/dts/sun4i-a10-inet1.dts
....@@ -164,20 +164,6 @@
164164 	status = "okay";
165165 };
166166 
167
-&pio {
168
-	usb0_id_detect_pin: usb0-id-detect-pin {
169
-		pins = "PH4";
170
-		function = "gpio_in";
171
-		bias-pull-up;
172
-	};
173
-
174
-	usb0_vbus_detect_pin: usb0-vbus-detect-pin {
175
-		pins = "PH5";
176
-		function = "gpio_in";
177
-		bias-pull-down;
178
-	};
179
-};
180
-
181167 &pwm {
182168 	pinctrl-names = "default";
183169 	pinctrl-0 = <&pwm0_pin>;
....@@ -233,10 +219,8 @@
233219 };
234220 
235221 &usbphy {
236
-	pinctrl-names = "default";
237
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
238
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
239
-	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
222
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
223
+	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
240224 	usb0_vbus-supply = <&reg_usb0_vbus>;
241225 	usb1_vbus-supply = <&reg_usb1_vbus>;
242226 	usb2_vbus-supply = <&reg_usb2_vbus>;