disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/arch/arm/boot/dts/sun7i-a20-bananapi.dts
..
..
@@ -76,8 +76,6 @@
76
76
 
77
77
 	leds {
78
78
 		compatible = "gpio-leds";
79
-		pinctrl-names = "default";
80
-		pinctrl-0 = <&led_pins_bananapi>;
81
79
 
82
80
 		green {
83
81
 			label = "bananapi:green:usr";
..
..
@@ -87,8 +85,6 @@
87
85
 
88
86
 	reg_gmac_3v3: gmac-3v3 {
89
87
 		compatible = "regulator-fixed";
90
-		pinctrl-names = "default";
91
-		pinctrl-0 = <&gmac_power_pin_bananapi>;
92
88
 		regulator-name = "gmac-3v3";
93
89
 		regulator-min-microvolt = <3300000>;
94
90
 		regulator-max-microvolt = <3300000>;
..
..
@@ -134,15 +130,11 @@
134
130
 
135
131
 &gmac {
136
132
 	pinctrl-names = "default";
137
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
138
-	phy = <&phy1>;
139
-	phy-mode = "rgmii";
133
+	pinctrl-0 = <&gmac_rgmii_pins>;
134
+	phy-handle = <&phy1>;
135
+	phy-mode = "rgmii-id";
140
136
 	phy-supply = <&reg_gmac_3v3>;
141
137
 	status = "okay";
142
-
143
-	phy1: ethernet-phy@1 {
144
-		reg = <1>;
145
-	};
146
138
 };
147
139
 
148
140
 &hdmi {
..
..
@@ -156,8 +148,6 @@
156
148
 };
157
149
 
158
150
 &i2c0 {
159
-	pinctrl-names = "default";
160
-	pinctrl-0 = <&i2c0_pins_a>;
161
151
 	status = "okay";
162
152
 
163
153
 	axp209: pmic@34 {
..
..
@@ -168,20 +158,22 @@
168
158
 };
169
159
 
170
160
 &i2c2 {
171
-	pinctrl-names = "default";
172
-	pinctrl-0 = <&i2c2_pins_a>;
173
161
 	status = "okay";
174
162
 };
175
163
 
176
164
 &ir0 {
177
165
 	pinctrl-names = "default";
178
-	pinctrl-0 = <&ir0_rx_pins_a>;
166
+	pinctrl-0 = <&ir0_rx_pin>;
179
167
 	status = "okay";
180
168
 };
181
169
 
170
+&gmac_mdio {
171
+	phy1: ethernet-phy@1 {
172
+		reg = <1>;
173
+	};
174
+};
175
+
182
176
 &mmc0 {
183
-	pinctrl-names = "default";
184
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
185
177
 	vmmc-supply = <&reg_vcc3v3>;
186
178
 	bus-width = <4>;
187
179
 	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
..
..
@@ -201,6 +193,11 @@
201
193
 };
202
194
 
203
195
 &pio {
196
+	vcc-pa-supply = <&reg_vcc3v3>;
197
+	vcc-pc-supply = <&reg_vcc3v3>;
198
+	vcc-pe-supply = <&reg_vcc3v3>;
199
+	vcc-pf-supply = <&reg_vcc3v3>;
200
+	vcc-pg-supply = <&reg_vcc3v3>;
204
201
 	gpio-line-names =
205
202
 		/* PA */
206
203
 		"ERXD3", "ERXD2", "ERXD1", "ERXD0", "ETXD3",
..
..
@@ -251,28 +248,6 @@
251
248
 			"SPI-MISO", "SPI-CE1", "",
252
249
 		"IO-6", "IO-3", "IO-2", "IO-0", "", "", "", "",
253
250
 		"", "", "", "", "", "", "", "";
254
-
255
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
256
-		pins = "PH4";
257
-		function = "gpio_in";
258
-		bias-pull-up;
259
-	};
260
-
261
-	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
262
-		pins = "PH10";
263
-		function = "gpio_in";
264
-		bias-pull-up;
265
-	};
266
-
267
-	gmac_power_pin_bananapi: gmac_power_pin@0 {
268
-		pins = "PH23";
269
-		function = "gpio_out";
270
-	};
271
-
272
-	led_pins_bananapi: led_pins@0 {
273
-		pins = "PH24";
274
-		function = "gpio_out";
275
-	};
276
251
 };
277
252
 
278
253
 #include "axp209.dtsi"
..
..
@@ -316,27 +291,27 @@
316
291
 
317
292
 &spi0 {
318
293
 	pinctrl-names = "default";
319
-	pinctrl-0 = <&spi0_pins_a>,
320
-		    <&spi0_cs0_pins_a>,
321
-		    <&spi0_cs1_pins_a>;
294
+	pinctrl-0 = <&spi0_pi_pins>,
295
+		    <&spi0_cs0_pi_pin>,
296
+		    <&spi0_cs1_pi_pin>;
322
297
 	status = "okay";
323
298
 };
324
299
 
325
300
 &uart0 {
326
301
 	pinctrl-names = "default";
327
-	pinctrl-0 = <&uart0_pins_a>;
302
+	pinctrl-0 = <&uart0_pb_pins>;
328
303
 	status = "okay";
329
304
 };
330
305
 
331
306
 &uart3 {
332
307
 	pinctrl-names = "default";
333
-	pinctrl-0 = <&uart3_pins_b>;
308
+	pinctrl-0 = <&uart3_ph_pins>;
334
309
 	status = "okay";
335
310
 };
336
311
 
337
312
 &uart7 {
338
313
 	pinctrl-names = "default";
339
-	pinctrl-0 = <&uart7_pins_a>;
314
+	pinctrl-0 = <&uart7_pi_pins>;
340
315
 	status = "okay";
341
316
 };
342
317
 
..
..
@@ -350,9 +325,7 @@
350
325
 };
351
326
 
352
327
 &usbphy {
353
-	pinctrl-names = "default";
354
-	pinctrl-0 = <&usb0_id_detect_pin>;
355
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
328
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
356
329
 	usb0_vbus_power-supply = <&usb_power_supply>;
357
330
 	usb0_vbus-supply = <&reg_usb0_vbus>;
358
331
 	usb1_vbus-supply = <&reg_usb1_vbus>;