hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/sun7i-a20-bananapro.dts
....@@ -62,8 +62,6 @@
6262
6363 leds {
6464 compatible = "gpio-leds";
65
- pinctrl-names = "default";
66
- pinctrl-0 = <&led_pins_bananapro>;
6765
6866 blue {
6967 label = "bananapro:blue:usr";
....@@ -78,15 +76,11 @@
7876
7977 wifi_pwrseq: wifi-pwrseq {
8078 compatible = "mmc-pwrseq-simple";
81
- pinctrl-names = "default";
82
- pinctrl-0 = <&vmmc3_pin_bananapro>;
8379 reset-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>;
8480 };
8581
8682 reg_gmac_3v3: gmac-3v3 {
8783 compatible = "regulator-fixed";
88
- pinctrl-names = "default";
89
- pinctrl-0 = <&gmac_power_pin_bananapro>;
9084 regulator-name = "gmac-3v3";
9185 regulator-min-microvolt = <3300000>;
9286 regulator-max-microvolt = <3300000>;
....@@ -114,20 +108,14 @@
114108
115109 &gmac {
116110 pinctrl-names = "default";
117
- pinctrl-0 = <&gmac_pins_rgmii_a>;
118
- phy = <&phy1>;
119
- phy-mode = "rgmii";
111
+ pinctrl-0 = <&gmac_rgmii_pins>;
112
+ phy-handle = <&phy1>;
113
+ phy-mode = "rgmii-id";
120114 phy-supply = <&reg_gmac_3v3>;
121115 status = "okay";
122
-
123
- phy1: ethernet-phy@1 {
124
- reg = <1>;
125
- };
126116 };
127117
128118 &i2c0 {
129
- pinctrl-names = "default";
130
- pinctrl-0 = <&i2c0_pins_a>;
131119 status = "okay";
132120
133121 axp209: pmic@34 {
....@@ -142,20 +130,22 @@
142130 };
143131
144132 &i2c2 {
145
- pinctrl-names = "default";
146
- pinctrl-0 = <&i2c2_pins_a>;
147133 status = "okay";
148134 };
149135
150136 &ir0 {
151137 pinctrl-names = "default";
152
- pinctrl-0 = <&ir0_rx_pins_a>;
138
+ pinctrl-0 = <&ir0_rx_pin>;
153139 status = "okay";
154140 };
155141
142
+&gmac_mdio {
143
+ phy1: ethernet-phy@1 {
144
+ reg = <1>;
145
+ };
146
+};
147
+
156148 &mmc0 {
157
- pinctrl-names = "default";
158
- pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>;
159149 vmmc-supply = <&reg_vcc3v3>;
160150 bus-width = <4>;
161151 cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
....@@ -163,8 +153,6 @@
163153 };
164154
165155 &mmc3 {
166
- pinctrl-names = "default";
167
- pinctrl-0 = <&mmc3_pins_a>;
168156 vmmc-supply = <&reg_vcc3v3>;
169157 mmc-pwrseq = <&wifi_pwrseq>;
170158 bus-width = <4>;
....@@ -188,74 +176,39 @@
188176 status = "okay";
189177 };
190178
191
-&pio {
192
- gmac_power_pin_bananapro: gmac_power_pin@0 {
193
- pins = "PH23";
194
- function = "gpio_out";
195
- };
196
-
197
- led_pins_bananapro: led_pins@0 {
198
- pins = "PH24", "PG2";
199
- function = "gpio_out";
200
- };
201
-
202
- mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
203
- pins = "PH10";
204
- function = "gpio_in";
205
- bias-pull-up;
206
- };
207
-
208
- usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
209
- pins = "PH0";
210
- function = "gpio_out";
211
- };
212
-
213
- usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
214
- pins = "PH1";
215
- function = "gpio_out";
216
- };
217
-
218
- vmmc3_pin_bananapro: vmmc3_pin@0 {
219
- pins = "PH22";
220
- function = "gpio_out";
221
- };
222
-};
223
-
224179 &reg_usb1_vbus {
225
- pinctrl-0 = <&usb1_vbus_pin_bananapro>;
226180 gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
227181 status = "okay";
228182 };
229183
230184 &reg_usb2_vbus {
231
- pinctrl-0 = <&usb2_vbus_pin_bananapro>;
232185 gpio = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
233186 status = "okay";
234187 };
235188
236189 &spi0 {
237190 pinctrl-names = "default";
238
- pinctrl-0 = <&spi0_pins_a>,
239
- <&spi0_cs0_pins_a>,
240
- <&spi0_cs1_pins_a>;
191
+ pinctrl-0 = <&spi0_pi_pins>,
192
+ <&spi0_cs0_pi_pin>,
193
+ <&spi0_cs1_pi_pin>;
241194 status = "okay";
242195 };
243196
244197 &uart0 {
245198 pinctrl-names = "default";
246
- pinctrl-0 = <&uart0_pins_a>;
199
+ pinctrl-0 = <&uart0_pb_pins>;
247200 status = "okay";
248201 };
249202
250203 &uart4 {
251204 pinctrl-names = "default";
252
- pinctrl-0 = <&uart4_pins_b>;
205
+ pinctrl-0 = <&uart4_ph_pins>;
253206 status = "okay";
254207 };
255208
256209 &uart7 {
257210 pinctrl-names = "default";
258
- pinctrl-0 = <&uart7_pins_a>;
211
+ pinctrl-0 = <&uart7_pi_pins>;
259212 status = "okay";
260213 };
261214