hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
....@@ -66,25 +66,11 @@
6666
6767 &mmc0 {
6868 pinctrl-names = "default";
69
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>;
69
+ pinctrl-0 = <&mmc0_pins>;
7070 vmmc-supply = <&reg_dcdc1>;
7171 bus-width = <4>;
7272 cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
7373 status = "okay";
74
-};
75
-
76
-&pio {
77
- mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {
78
- pins = "PA8";
79
- function = "gpio_in";
80
- bias-pull-up;
81
- };
82
-
83
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
84
- pins = "PA15";
85
- function = "gpio_in";
86
- bias-pull-up;
87
- };
8874 };
8975
9076 &p2wi {
....@@ -179,9 +165,7 @@
179165 };
180166
181167 &usbphy {
182
- pinctrl-names = "default";
183
- pinctrl-0 = <&usb0_id_detect_pin>;
184
- usb0_id_det-gpio = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */
168
+ usb0_id_det-gpios = <&pio 0 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PA15 */
185169 usb0_vbus_power-supply = <&usb_power_supply>;
186170 usb0_vbus-supply = <&reg_drivevbus>;
187171 usb1_vbus-supply = <&reg_dldo1>;