hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/arch/arm/boot/dts/sun5i-r8-chip.dts
....@@ -79,16 +79,12 @@
7979
8080 mmc0_pwrseq: mmc0_pwrseq {
8181 compatible = "mmc-pwrseq-simple";
82
- pinctrl-names = "default";
83
- pinctrl-0 = <&chip_wifi_reg_on_pin>;
8482 reset-gpios = <&pio 2 19 GPIO_ACTIVE_LOW>; /* PC19 */
8583 };
8684
8785 onewire {
8886 compatible = "w1-gpio";
89
- gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */
90
- pinctrl-names = "default";
91
- pinctrl-0 = <&chip_w1_pin>;
87
+ gpios = <&pio 3 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PD2 */
9288 };
9389 };
9490
....@@ -109,8 +105,6 @@
109105 };
110106
111107 &i2c0 {
112
- pinctrl-names = "default";
113
- pinctrl-0 = <&i2c0_pins_a>;
114108 status = "okay";
115109
116110 axp209: pmic@34 {
....@@ -137,14 +131,10 @@
137131 };
138132
139133 &i2c1 {
140
- pinctrl-names = "default";
141
- pinctrl-0 = <&i2c1_pins_a>;
142134 status = "disabled";
143135 };
144136
145137 &i2c2 {
146
- pinctrl-names = "default";
147
- pinctrl-0 = <&i2c2_pins_a>;
148138 status = "okay";
149139
150140 xio: gpio@38 {
....@@ -161,13 +151,11 @@
161151 };
162152 };
163153
164
-&mmc0_pins_a {
154
+&mmc0_pins {
165155 bias-pull-up;
166156 };
167157
168158 &mmc0 {
169
- pinctrl-names = "default";
170
- pinctrl-0 = <&mmc0_pins_a>;
171159 vmmc-supply = <&reg_vcc3v3>;
172160 mmc-pwrseq = <&mmc0_pwrseq>;
173161 bus-width = <4>;
....@@ -181,29 +169,6 @@
181169
182170 &otg_sram {
183171 status = "okay";
184
-};
185
-
186
-&pio {
187
- chip_vbus_pin: chip_vbus_pin@0 {
188
- pins = "PB10";
189
- function = "gpio_out";
190
- };
191
-
192
- chip_wifi_reg_on_pin: chip_wifi_reg_on_pin@0 {
193
- pins = "PC19";
194
- function = "gpio_out";
195
- };
196
-
197
- chip_id_det_pin: chip_id_det_pin@0 {
198
- pins = "PG2";
199
- function = "gpio_in";
200
- };
201
-
202
- chip_w1_pin: chip_w1_pin@0 {
203
- pins = "PD2";
204
- function = "gpio_in";
205
- bias-pull-up;
206
- };
207172 };
208173
209174 &reg_dcdc2 {
....@@ -260,7 +225,6 @@
260225 };
261226
262227 &reg_usb0_vbus {
263
- pinctrl-0 = <&chip_vbus_pin>;
264228 vin-supply = <&reg_vcc5v0>;
265229 gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
266230 status = "okay";
....@@ -268,7 +232,7 @@
268232
269233 &spi2 {
270234 pinctrl-names = "default";
271
- pinctrl-0 = <&spi2_pins_a>;
235
+ pinctrl-0 = <&spi2_pe_pins>;
272236 status = "disabled";
273237 };
274238
....@@ -282,14 +246,14 @@
282246
283247 &uart1 {
284248 pinctrl-names = "default";
285
- pinctrl-0 = <&uart1_pins_b>;
249
+ pinctrl-0 = <&uart1_pg_pins>;
286250 status = "okay";
287251 };
288252
289253 &uart3 {
290254 pinctrl-names = "default";
291
- pinctrl-0 = <&uart3_pins_a>,
292
- <&uart3_cts_rts_pins_a>;
255
+ pinctrl-0 = <&uart3_pg_pins>,
256
+ <&uart3_cts_rts_pg_pins>;
293257 status = "okay";
294258 };
295259
....@@ -303,11 +267,9 @@
303267 };
304268
305269 &usbphy {
306
- pinctrl-names = "default";
307
- pinctrl-0 = <&chip_id_det_pin>;
308270 status = "okay";
309271
310
- usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
272
+ usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
311273 usb0_vbus_power-supply = <&usb_power_supply>;
312274 usb0_vbus-supply = <&reg_usb0_vbus>;
313275 usb1_vbus-supply = <&reg_vcc5v0>;