hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun5i-gr8-evb.dts
....@@ -123,8 +123,6 @@
123123 };
124124
125125 &i2c0 {
126
- pinctrl-names = "default";
127
- pinctrl-0 = <&i2c0_pins_a>;
128126 status = "okay";
129127
130128 axp209: pmic@34 {
....@@ -143,8 +141,6 @@
143141 #include "axp209.dtsi"
144142
145143 &i2c1 {
146
- pinctrl-names = "default";
147
- pinctrl-0 = <&i2c1_pins_a>;
148144 status = "okay";
149145
150146 wm8978: codec@1a {
....@@ -154,26 +150,24 @@
154150 };
155151
156152 pcf8563: rtc@51 {
157
- compatible = "phg,pcf8563";
153
+ compatible = "nxp,pcf8563";
158154 reg = <0x51>;
159155 };
160156 };
161157
162158 &i2c2 {
163
- pinctrl-names = "default";
164
- pinctrl-0 = <&i2c2_pins_a>;
165159 status = "okay";
166160 };
167161
168162 &i2s0 {
169163 pinctrl-names = "default";
170
- pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
164
+ pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
171165 status = "okay";
172166 };
173167
174168 &ir0 {
175169 pinctrl-names = "default";
176
- pinctrl-0 = <&ir0_rx_pins_a>;
170
+ pinctrl-0 = <&ir0_rx_pin>;
177171 status = "okay";
178172 };
179173
....@@ -181,49 +175,49 @@
181175 vref-supply = <&reg_ldo2>;
182176 status = "okay";
183177
184
- button@190 {
178
+ button-190 {
185179 label = "Volume Up";
186180 linux,code = <KEY_VOLUMEUP>;
187181 channel = <0>;
188182 voltage = <190000>;
189183 };
190184
191
- button@390 {
185
+ button-390 {
192186 label = "Volume Down";
193187 linux,code = <KEY_VOLUMEDOWN>;
194188 channel = <0>;
195189 voltage = <390000>;
196190 };
197191
198
- button@600 {
192
+ button-600 {
199193 label = "Menu";
200194 linux,code = <KEY_MENU>;
201195 channel = <0>;
202196 voltage = <600000>;
203197 };
204198
205
- button@800 {
199
+ button-800 {
206200 label = "Search";
207201 linux,code = <KEY_SEARCH>;
208202 channel = <0>;
209203 voltage = <800000>;
210204 };
211205
212
- button@980 {
206
+ button-980 {
213207 label = "Home";
214208 linux,code = <KEY_HOMEPAGE>;
215209 channel = <0>;
216210 voltage = <980000>;
217211 };
218212
219
- button@1180 {
213
+ button-1180 {
220214 label = "Esc";
221215 linux,code = <KEY_ESC>;
222216 channel = <0>;
223217 voltage = <1180000>;
224218 };
225219
226
- button@1400 {
220
+ button-1400 {
227221 label = "Enter";
228222 linux,code = <KEY_ENTER>;
229223 channel = <0>;
....@@ -232,8 +226,6 @@
232226 };
233227
234228 &mmc0 {
235
- pinctrl-names = "default";
236
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>;
237229 vmmc-supply = <&reg_vcc3v3>;
238230 bus-width = <4>;
239231 cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
....@@ -242,7 +234,7 @@
242234
243235 &nfc {
244236 pinctrl-names = "default";
245
- pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
237
+ pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
246238
247239 /* MLC Support sucks for now */
248240 status = "disabled";
....@@ -256,31 +248,9 @@
256248 status = "okay";
257249 };
258250
259
-&pio {
260
- mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {
261
- pins = "PG0";
262
- function = "gpio_in";
263
- };
264
-
265
- usb0_id_pin_gr8_evb: usb0-id-pin@0 {
266
- pins = "PG2";
267
- function = "gpio_in";
268
- };
269
-
270
- usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {
271
- pins = "PG1";
272
- function = "gpio_in";
273
- };
274
-
275
- usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
276
- pins = "PG13";
277
- function = "gpio_out";
278
- };
279
-};
280
-
281251 &pwm {
282252 pinctrl-names = "default";
283
- pinctrl-0 = <&pwm0_pins>;
253
+ pinctrl-0 = <&pwm0_pin>;
284254 status = "okay";
285255 };
286256
....@@ -310,7 +280,6 @@
310280 };
311281
312282 &reg_usb1_vbus {
313
- pinctrl-0 = <&usb1_vbus_pin_gr8_evb>;
314283 gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
315284 status = "okay";
316285 };
....@@ -321,7 +290,7 @@
321290
322291 &spdif {
323292 pinctrl-names = "default";
324
- pinctrl-0 = <&spdif_tx_pins_a>;
293
+ pinctrl-0 = <&spdif_tx_pin>;
325294 status = "okay";
326295 };
327296
....@@ -331,7 +300,7 @@
331300
332301 &uart1 {
333302 pinctrl-names = "default";
334
- pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
303
+ pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
335304 status = "okay";
336305 };
337306
....@@ -356,10 +325,8 @@
356325 };
357326
358327 &usbphy {
359
- pinctrl-names = "default";
360
- pinctrl-0 = <&usb0_id_pin_gr8_evb>, <&usb0_vbus_det_pin_gr8_evb>;
361
- usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
362
- usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
328
+ usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
329
+ usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
363330 usb0_vbus_power-supply = <&usb_power_supply>;
364331 usb1_vbus-supply = <&reg_usb1_vbus>;
365332 status = "okay";