forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29
kernel/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
....@@ -73,8 +73,6 @@
7373 reg = <0x40>;
7474 interrupt-parent = <&pio>;
7575 interrupts = <1 5 IRQ_TYPE_EDGE_FALLING>; /* PB5 */
76
- pinctrl-names = "default";
77
- pinctrl-0 = <&ts_power_pin>;
7876 power-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
7977 /* Tablet dts must provide reg and compatible */
8078 status = "disabled";
....@@ -82,31 +80,10 @@
8280 };
8381
8482 &mmc0 {
85
- pinctrl-names = "default";
86
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
8783 vmmc-supply = <&reg_dcdc1>;
8884 bus-width = <4>;
8985 cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
9086 status = "okay";
91
-};
92
-
93
-&pio {
94
- mmc0_cd_pin: mmc0_cd_pin@0 {
95
- pins = "PB4";
96
- function = "gpio_in";
97
- bias-pull-up;
98
- };
99
-
100
- ts_power_pin: ts_power_pin@0 {
101
- pins = "PH1";
102
- function = "gpio_out";
103
- };
104
-
105
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
106
- pins = "PH8";
107
- function = "gpio_in";
108
- bias-pull-up;
109
- };
11087 };
11188
11289 &r_rsb {
....@@ -239,9 +216,7 @@
239216 };
240217
241218 &usbphy {
242
- pinctrl-names = "default";
243
- pinctrl-0 = <&usb0_id_detect_pin>;
244
- usb0_id_det-gpio = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */
219
+ usb0_id_det-gpios = <&pio 7 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH8 */
245220 usb0_vbus_power-supply = <&usb_power_supply>;
246221 usb0_vbus-supply = <&reg_drivevbus>;
247222 status = "okay";