hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
....@@ -63,8 +63,6 @@
6363 pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
6464 brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
6565 default-brightness-level = <8>;
66
- pinctrl-names = "default";
67
- pinctrl-0 = <&bl_enable_pin>;
6866 enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
6967 };
7068
....@@ -74,8 +72,6 @@
7472 };
7573
7674 &codec {
77
- pinctrl-names = "default";
78
- pinctrl-0 = <&codec_pa_pin>;
7975 allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
8076 status = "okay";
8177 };
....@@ -93,8 +89,6 @@
9389 };
9490
9591 &i2c0 {
96
- pinctrl-names = "default";
97
- pinctrl-0 = <&i2c0_pins_a>;
9892 status = "okay";
9993
10094 axp209: pmic@34 {
....@@ -107,14 +101,10 @@
107101 #include "axp209.dtsi"
108102
109103 &i2c1 {
110
- pinctrl-names = "default";
111
- pinctrl-0 = <&i2c1_pins_a>;
112104 status = "okay";
113105 };
114106
115107 &i2c2 {
116
- pinctrl-names = "default";
117
- pinctrl-0 = <&i2c2_pins_a>;
118108 status = "okay";
119109
120110 gt911: touchscreen@5d {
....@@ -122,8 +112,6 @@
122112 reg = <0x5d>;
123113 interrupt-parent = <&pio>;
124114 interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; /* EINT21 (PH21) */
125
- pinctrl-names = "default";
126
- pinctrl-0 = <&ts_reset_pin>;
127115 irq-gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; /* INT (PH21) */
128116 reset-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* RST (PB13) */
129117 touchscreen-swapped-x-y;
....@@ -134,14 +122,14 @@
134122 vref-supply = <&reg_vcc3v0>;
135123 status = "okay";
136124
137
- button@571 {
125
+ button-571 {
138126 label = "Volume Up";
139127 linux,code = <KEY_VOLUMEUP>;
140128 channel = <0>;
141129 voltage = <571428>;
142130 };
143131
144
- button@761 {
132
+ button-761 {
145133 label = "Volume Down";
146134 linux,code = <KEY_VOLUMEDOWN>;
147135 channel = <0>;
....@@ -150,8 +138,6 @@
150138 };
151139
152140 &mmc0 {
153
- pinctrl-names = "default";
154
- pinctrl-0 = <&mmc0_pins_a>;
155141 vmmc-supply = <&reg_vcc3v3>;
156142 bus-width = <4>;
157143 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -170,32 +156,9 @@
170156 status = "okay";
171157 };
172158
173
-&pio {
174
- bl_enable_pin: bl_enable_pin@0 {
175
- pins = "PH7";
176
- function = "gpio_out";
177
- };
178
-
179
- codec_pa_pin: codec_pa_pin@0 {
180
- pins = "PH15";
181
- function = "gpio_out";
182
- };
183
-
184
- ts_reset_pin: ts_reset_pin@0 {
185
- pins = "PB13";
186
- function = "gpio_out";
187
- };
188
-
189
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
190
- pins = "PH4";
191
- function = "gpio_in";
192
- bias-pull-up;
193
- };
194
-};
195
-
196159 &pwm {
197160 pinctrl-names = "default";
198
- pinctrl-0 = <&pwm0_pins_a>;
161
+ pinctrl-0 = <&pwm0_pin>;
199162 status = "okay";
200163 };
201164
....@@ -238,7 +201,7 @@
238201
239202 &uart0 {
240203 pinctrl-names = "default";
241
- pinctrl-0 = <&uart0_pins_a>;
204
+ pinctrl-0 = <&uart0_pb_pins>;
242205 status = "okay";
243206 };
244207
....@@ -252,9 +215,7 @@
252215 };
253216
254217 &usbphy {
255
- pinctrl-names = "default";
256
- pinctrl-0 = <&usb0_id_detect_pin>;
257
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
218
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
258219 usb0_vbus_power-supply = <&usb_power_supply>;
259220 usb0_vbus-supply = <&reg_usb0_vbus>;
260221 usb1_vbus-supply = <&reg_usb1_vbus>;