modify sin led gpio

hc

2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e

 kernel/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
..
..
@@ -110,14 +110,10 @@
110
110
 
111
111
 &gmac {
112
112
 	pinctrl-names = "default";
113
-	pinctrl-0 = <&gmac_pins_rgmii_a>;
114
-	phy = <&phy1>;
115
-	phy-mode = "rgmii";
113
+	pinctrl-0 = <&gmac_rgmii_pins>;
114
+	phy-handle = <&phy1>;
115
+	phy-mode = "rgmii-id";
116
116
 	status = "okay";
117
-
118
-	phy1: ethernet-phy@1 {
119
-		reg = <1>;
120
-	};
121
117
 };
122
118
 
123
119
 &hdmi {
..
..
@@ -131,8 +127,6 @@
131
127
 };
132
128
 
133
129
 &i2c0 {
134
-	pinctrl-names = "default";
135
-	pinctrl-0 = <&i2c0_pins_a>;
136
130
 	status = "okay";
137
131
 
138
132
 	axp209: pmic@34 {
..
..
@@ -143,8 +137,6 @@
143
137
 };
144
138
 
145
139
 &i2c1 {
146
-	pinctrl-names = "default";
147
-	pinctrl-0 = <&i2c1_pins_a>;
148
140
 	status = "okay";
149
141
 
150
142
 	eeprom: eeprom@50 {
..
..
@@ -154,9 +146,17 @@
154
146
 	};
155
147
 };
156
148
 
149
+&lradc {
150
+	vref-supply = <&reg_vcc3v0>;
151
+};
152
+
153
+&gmac_mdio {
154
+	phy1: ethernet-phy@1 {
155
+		reg = <1>;
156
+	};
157
+};
158
+
157
159
 &mmc0 {
158
-	pinctrl-names = "default";
159
-	pinctrl-0 = <&mmc0_pins_a>;
160
160
 	vmmc-supply = <&reg_vcc3v3>;
161
161
 	bus-width = <4>;
162
162
 	cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
..
..
@@ -176,42 +176,33 @@
176
176
 };
177
177
 
178
178
 &pio {
179
-	ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
180
-		pins = "PC3";
181
-		function = "gpio_out";
182
-	};
179
+	vcc-pa-supply = <&reg_vcc3v3>;
180
+	vcc-pc-supply = <&reg_vcc3v3>;
181
+	vcc-pe-supply = <&reg_ldo3>;
182
+	vcc-pf-supply = <&reg_vcc3v3>;
183
+	vcc-pg-supply = <&reg_ldo4>;
183
184
 
184
-	led_pins_olinuxinolime: led_pins@0 {
185
+	led_pins_olinuxinolime: led-pins {
185
186
 		pins = "PH2";
186
187
 		function = "gpio_out";
187
188
 		drive-strength = <20>;
188
189
 	};
189
-
190
-	usb0_id_detect_pin: usb0_id_detect_pin@0 {
191
-		pins = "PH4";
192
-		function = "gpio_in";
193
-		bias-pull-up;
194
-	};
195
-
196
-	usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
197
-		pins = "PH5";
198
-		function = "gpio_in";
199
-		bias-pull-down;
200
-	};
201
-
202
-	usb0_vbus_pin_lime2: usb0_vbus_pin@0 {
203
-		pins = "PC17";
204
-		function = "gpio_out";
205
-	};
206
190
 };
207
191
 
208
192
 &reg_ahci_5v {
209
-	pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
210
193
 	gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
211
194
 	status = "okay";
212
195
 };
213
196
 
214
197
 #include "axp209.dtsi"
198
+
199
+&ac_power_supply {
200
+	status = "okay";
201
+};
202
+
203
+&battery_power_supply {
204
+	status = "okay";
205
+};
215
206
 
216
207
 &reg_dcdc2 {
217
208
 	regulator-always-on;
..
..
@@ -245,6 +236,8 @@
245
236
 	regulator-min-microvolt = <2800000>;
246
237
 	regulator-max-microvolt = <2800000>;
247
238
 	regulator-name = "vddio-csi0";
239
+	regulator-soft-start;
240
+	regulator-ramp-delay = <1600>;
248
241
 };
249
242
 
250
243
 &reg_ldo4 {
..
..
@@ -254,7 +247,6 @@
254
247
 };
255
248
 
256
249
 &reg_usb0_vbus {
257
-	pinctrl-0 = <&usb0_vbus_pin_lime2>;
258
250
 	gpio = <&pio 2 17 GPIO_ACTIVE_HIGH>;
259
251
 	status = "okay";
260
252
 };
..
..
@@ -269,7 +261,7 @@
269
261
 
270
262
 &uart0 {
271
263
 	pinctrl-names = "default";
272
-	pinctrl-0 = <&uart0_pins_a>;
264
+	pinctrl-0 = <&uart0_pb_pins>;
273
265
 	status = "okay";
274
266
 };
275
267
 
..
..
@@ -279,10 +271,8 @@
279
271
 };
280
272
 
281
273
 &usbphy {
282
-	pinctrl-names = "default";
283
-	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
284
-	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
285
-	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
274
+	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
275
+	usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* PH5 */
286
276
 	usb0_vbus-supply = <&reg_usb0_vbus>;
287
277
 	usb1_vbus-supply = <&reg_usb1_vbus>;
288
278
 	usb2_vbus-supply = <&reg_usb2_vbus>;