hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun7i-a20-m3.dts
....@@ -63,8 +63,6 @@
6363
6464 leds {
6565 compatible = "gpio-leds";
66
- pinctrl-names = "default";
67
- pinctrl-0 = <&led_pins_m3>;
6866
6967 blue {
7068 label = "m3:blue:usr";
....@@ -83,19 +81,13 @@
8381
8482 &gmac {
8583 pinctrl-names = "default";
86
- pinctrl-0 = <&gmac_pins_mii_a>;
87
- phy = <&phy1>;
84
+ pinctrl-0 = <&gmac_mii_pins>;
85
+ phy-handle = <&phy1>;
8886 phy-mode = "mii";
8987 status = "okay";
90
-
91
- phy1: ethernet-phy@1 {
92
- reg = <1>;
93
- };
9488 };
9589
9690 &i2c0 {
97
- pinctrl-names = "default";
98
- pinctrl-0 = <&i2c0_pins_a>;
9991 status = "okay";
10092
10193 axp209: pmic@34 {
....@@ -111,13 +103,17 @@
111103
112104 &ir0 {
113105 pinctrl-names = "default";
114
- pinctrl-0 = <&ir0_rx_pins_a>;
106
+ pinctrl-0 = <&ir0_rx_pin>;
115107 status = "okay";
116108 };
117109
110
+&gmac_mdio {
111
+ phy1: ethernet-phy@1 {
112
+ reg = <1>;
113
+ };
114
+};
115
+
118116 &mmc0 {
119
- pinctrl-names = "default";
120
- pinctrl-0 = <&mmc0_pins_a>;
121117 vmmc-supply = <&reg_vcc3v3>;
122118 bus-width = <4>;
123119 cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
....@@ -125,8 +121,6 @@
125121 };
126122
127123 &mmc2 {
128
- pinctrl-names = "default";
129
- pinctrl-0 = <&mmc2_pins_a>;
130124 vmmc-supply = <&reg_vcc3v3>;
131125 bus-width = <4>;
132126 non-removable;
....@@ -141,13 +135,6 @@
141135 status = "okay";
142136 };
143137
144
-&pio {
145
- led_pins_m3: led_pins@0 {
146
- pins = "PH20";
147
- function = "gpio_out";
148
- };
149
-};
150
-
151138 &reg_usb1_vbus {
152139 status = "okay";
153140 };
....@@ -158,7 +145,7 @@
158145
159146 &uart0 {
160147 pinctrl-names = "default";
161
- pinctrl-0 = <&uart0_pins_a>;
148
+ pinctrl-0 = <&uart0_pb_pins>;
162149 status = "okay";
163150 };
164151