hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
....@@ -74,8 +74,6 @@
7474
7575 leds {
7676 compatible = "gpio-leds";
77
- pinctrl-names = "default";
78
- pinctrl-0 = <&led_pins_lamobo_r1>;
7977
8078 green {
8179 label = "lamobo_r1:green:usr";
....@@ -85,8 +83,6 @@
8583
8684 reg_gmac_3v3: gmac-3v3 {
8785 compatible = "regulator-fixed";
88
- pinctrl-names = "default";
89
- pinctrl-0 = <&gmac_power_pin_lamobo_r1>;
9086 regulator-name = "gmac-3v3";
9187 regulator-min-microvolt = <3300000>;
9288 regulator-max-microvolt = <3300000>;
....@@ -123,7 +119,7 @@
123119
124120 &gmac {
125121 pinctrl-names = "default";
126
- pinctrl-0 = <&gmac_pins_rgmii_a>;
122
+ pinctrl-0 = <&gmac_rgmii_pins>;
127123 phy-mode = "rgmii";
128124 phy-supply = <&reg_gmac_3v3>;
129125 status = "okay";
....@@ -141,8 +137,6 @@
141137 switch: ethernet-switch@1e {
142138 compatible = "brcm,bcm53125";
143139 reg = <30>;
144
- #address-cells = <1>;
145
- #size-cells = <0>;
146140
147141 ports {
148142 #address-cells = <1>;
....@@ -199,8 +193,6 @@
199193 };
200194
201195 &i2c0 {
202
- pinctrl-names = "default";
203
- pinctrl-0 = <&i2c0_pins_a>;
204196 status = "okay";
205197
206198 axp209: pmic@34 {
....@@ -211,20 +203,16 @@
211203 };
212204
213205 &i2c2 {
214
- pinctrl-names = "default";
215
- pinctrl-0 = <&i2c2_pins_a>;
216206 status = "okay";
217207 };
218208
219209 &ir0 {
220210 pinctrl-names = "default";
221
- pinctrl-0 = <&ir0_rx_pins_a>;
211
+ pinctrl-0 = <&ir0_rx_pin>;
222212 status = "okay";
223213 };
224214
225215 &mmc0 {
226
- pinctrl-names = "default";
227
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>;
228216 vmmc-supply = <&reg_vcc3v3>;
229217 bus-width = <4>;
230218 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
....@@ -237,30 +225,6 @@
237225
238226 &otg_sram {
239227 status = "okay";
240
-};
241
-
242
-&pio {
243
- usb0_id_detect_pin: usb0_id_detect_pin@0 {
244
- pins = "PH4";
245
- function = "gpio_in";
246
- bias-pull-up;
247
- };
248
-
249
- mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {
250
- pins = "PH10";
251
- function = "gpio_in";
252
- bias-pull-up;
253
- };
254
-
255
- gmac_power_pin_lamobo_r1: gmac_power_pin@0 {
256
- pins = "PH23";
257
- function = "gpio_out";
258
- };
259
-
260
- led_pins_lamobo_r1: led_pins@0 {
261
- pins = "PH24";
262
- function = "gpio_out";
263
- };
264228 };
265229
266230 #include "axp209.dtsi"
....@@ -314,27 +278,27 @@
314278
315279 &spi0 {
316280 pinctrl-names = "default";
317
- pinctrl-0 = <&spi0_pins_a>,
318
- <&spi0_cs0_pins_a>,
319
- <&spi0_cs1_pins_a>;
281
+ pinctrl-0 = <&spi0_pi_pins>,
282
+ <&spi0_cs0_pi_pin>,
283
+ <&spi0_cs1_pi_pin>;
320284 status = "okay";
321285 };
322286
323287 &uart0 {
324288 pinctrl-names = "default";
325
- pinctrl-0 = <&uart0_pins_a>;
289
+ pinctrl-0 = <&uart0_pb_pins>;
326290 status = "okay";
327291 };
328292
329293 &uart3 {
330294 pinctrl-names = "default";
331
- pinctrl-0 = <&uart3_pins_b>;
295
+ pinctrl-0 = <&uart3_ph_pins>;
332296 status = "okay";
333297 };
334298
335299 &uart7 {
336300 pinctrl-names = "default";
337
- pinctrl-0 = <&uart7_pins_a>;
301
+ pinctrl-0 = <&uart7_pi_pins>;
338302 status = "okay";
339303 };
340304
....@@ -348,9 +312,7 @@
348312 };
349313
350314 &usbphy {
351
- pinctrl-names = "default";
352
- pinctrl-0 = <&usb0_id_detect_pin>;
353
- usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
315
+ usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
354316 usb0_vbus_power-supply = <&usb_power_supply>;
355317 usb0_vbus-supply = <&reg_usb0_vbus>;
356318 usb2_vbus-supply = <&reg_usb2_vbus>;