修改led为gpio

hc

2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d

 kernel/arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
..
..
@@ -74,8 +74,6 @@
74
74
 
75
75
 	leds {
76
76
 		compatible = "gpio-leds";
77
-		pinctrl-names = "default";
78
-		pinctrl-0 = <&led_pins_orangepi>;
79
77
 
80
78
 		green {
81
79
 			label = "orangepi:green:usr";
..
..
@@ -90,8 +88,6 @@
90
88
 
91
89
 	reg_gmac_3v3: gmac-3v3 {
92
90
 		compatible = "regulator-fixed";
93
-		pinctrl-names = "default";
94
-		pinctrl-0 = <&gmac_power_pin_orangepi>;
95
91
 		regulator-name = "gmac-3v3";
96
92
 		regulator-min-microvolt = <3300000>;
97
93
 		regulator-max-microvolt = <3300000>;
..
..
@@ -123,15 +119,11 @@
123
119
 
124
120
 &gmac {
125
121
 	pinctrl-names = "default";
126
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
127
-	phy = <&phy1>;
122
+	pinctrl-0 = <&gmac_rgmii_pins>;
123
+	phy-handle = <&phy1>;
128
124
 	phy-mode = "rgmii";
129
125
 	phy-supply = <&reg_gmac_3v3>;
130
126
 	status = "okay";
131
-
132
-	phy1: ethernet-phy@1 {
133
-		reg = <1>;
134
-	};
135
127
 };
136
128
 
137
129
 &hdmi {
..
..
@@ -145,8 +137,6 @@
145
137
 };
146
138
 
147
139
 &i2c0 {
148
-	pinctrl-names = "default";
149
-	pinctrl-0 = <&i2c0_pins_a>;
150
140
 	status = "okay";
151
141
 
152
142
 	axp209: pmic@34 {
..
..
@@ -160,13 +150,17 @@
160
150
 
161
151
 &ir0 {
162
152
 	pinctrl-names = "default";
163
-	pinctrl-0 = <&ir0_rx_pins_a>;
153
+	pinctrl-0 = <&ir0_rx_pin>;
164
154
 	status = "okay";
165
155
 };
166
156
 
157
+&gmac_mdio {
158
+	phy1: ethernet-phy@1 {
159
+		reg = <1>;
160
+	};
161
+};
162
+
167
163
 &mmc0 {
168
-	pinctrl-names = "default";
169
-	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>;
170
164
 	vmmc-supply = <&reg_vcc3v3>;
171
165
 	bus-width = <4>;
172
166
 	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
..
..
@@ -174,8 +168,6 @@
174
168
 };
175
169
 
176
170
 &mmc3 {
177
-	pinctrl-names = "default";
178
-	pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_orangepi>;
179
171
 	vmmc-supply = <&reg_vcc3v3>;
180
172
 	bus-width = <4>;
181
173
 	cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
..
..
@@ -184,46 +176,6 @@
184
176
 
185
177
 &otg_sram {
186
178
 	status = "okay";
187
-};
188
-
189
-&pio {
190
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
191
-		pins = "PH4";
192
-		function = "gpio_in";
193
-		bias-pull-up;
194
-	};
195
-
196
-	mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {
197
-		pins = "PH10";
198
-		function = "gpio_in";
199
-		bias-pull-up;
200
-	};
201
-
202
-	mmc3_cd_pin_orangepi: mmc3_cd_pin@0 {
203
-		pins = "PH11";
204
-		function = "gpio_in";
205
-		bias-pull-up;
206
-	};
207
-
208
-	usb2_vbus_pin_bananapro: usb2_vbus_pin@0 {
209
-		pins = "PH22";
210
-		function = "gpio_out";
211
-	};
212
-
213
-	gmac_power_pin_orangepi: gmac_power_pin@0 {
214
-		pins = "PH23";
215
-		function = "gpio_out";
216
-	};
217
-
218
-	led_pins_orangepi: led_pins@0 {
219
-		pins = "PH24", "PH25";
220
-		function = "gpio_out";
221
-	};
222
-
223
-	usb1_vbus_pin_bananapro: usb1_vbus_pin@0 {
224
-		pins = "PH26";
225
-		function = "gpio_out";
226
-	};
227
179
 };
228
180
 
229
181
 &reg_dcdc2 {
..
..
@@ -256,20 +208,18 @@
256
208
 };
257
209
 
258
210
 &reg_usb1_vbus {
259
-	pinctrl-0 = <&usb1_vbus_pin_bananapro>;
260
211
 	gpio = <&pio 7 26 GPIO_ACTIVE_HIGH>; /* PH26 */
261
212
 	status = "okay";
262
213
 };
263
214
 
264
215
 &reg_usb2_vbus {
265
-	pinctrl-0 = <&usb2_vbus_pin_bananapro>;
266
216
 	gpio = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
267
217
 	status = "okay";
268
218
 };
269
219
 
270
220
 &uart0 {
271
221
 	pinctrl-names = "default";
272
-	pinctrl-0 = <&uart0_pins_a>;
222
+	pinctrl-0 = <&uart0_pb_pins>;
273
223
 	status = "okay";
274
224
 };
275
225
 
..
..
@@ -283,9 +233,7 @@
283
233
 };
284
234
 
285
235
 &usbphy {
286
-	pinctrl-names = "default";
287
-	pinctrl-0 = <&usb0_id_detect_pin>;
288
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
236
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
289
237
 	usb0_vbus_power-supply = <&usb_power_supply>;
290
238
 	usb0_vbus-supply = <&reg_usb0_vbus>;
291
239
 	usb1_vbus-supply = <&reg_usb1_vbus>;