Skip to content

Commit f606c4b

Browse files
mripardmripard
committed
ARM: dts: sun5i: Remove all useless pinctrl nodes
The gpio pinctrl nodes are redundant and as such useless most of the times. Since they will also generate warnings in DTC, we can simply remove most of them. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
1 parent 7d94610 commit f606c4b

13 files changed

+2
-160
lines changed

‎arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171

7272
reg_vmmc1: vmmc1 {
7373
compatible = "regulator-fixed";
74-
pinctrl-names = "default";
75-
pinctrl-0 = <&mmc1_vcc_en_pin_t004>;
7674
regulator-name = "vmmc1";
7775
regulator-min-microvolt = <3300000>;
7876
regulator-max-microvolt = <3300000>;
@@ -139,11 +137,6 @@
139137
bias-pull-up;
140138
};
141139

142-
mmc1_vcc_en_pin_t004: mmc1_vcc_en_pin@0 {
143-
pins = "PB18";
144-
function = "gpio_out";
145-
};
146-
147140
led_pins_t004: led_pins@0 {
148141
pins = "PB2";
149142
function = "gpio_out";

‎arch/arm/boot/dts/sun5i-a10s-mk802.dts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959

6060
leds {
6161
compatible = "gpio-leds";
62-
pinctrl-names = "default";
63-
pinctrl-0 = <&led_pins_mk802>;
6462

6563
red {
6664
label = "mk802:red:usr";
@@ -114,25 +112,14 @@
114112
};
115113

116114
&pio {
117-
led_pins_mk802: led_pins@0 {
118-
pins = "PB2";
119-
function = "gpio_out";
120-
};
121-
122115
mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
123116
pins = "PG1";
124117
function = "gpio_in";
125118
bias-pull-up;
126119
};
127-
128-
usb1_vbus_pin_mk802: usb1_vbus_pin@0 {
129-
pins = "PB10";
130-
function = "gpio_out";
131-
};
132120
};
133121

134122
&reg_usb1_vbus {
135-
pinctrl-0 = <&usb1_vbus_pin_mk802>;
136123
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
137124
status = "okay";
138125
};

‎arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,6 @@
241241
drive-strength = <20>;
242242
};
243243

244-
usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
245-
pins = "PB10";
246-
function = "gpio_out";
247-
};
248-
249244
usb0_id_detect_pin: usb0_id_detect_pin@0 {
250245
pins = "PG12";
251246
function = "gpio_in";
@@ -259,7 +254,6 @@
259254
};
260255

261256
&reg_usb1_vbus {
262-
pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
263257
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>;
264258
status = "okay";
265259
};

‎arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,9 @@
109109
function = "gpio_out";
110110
drive-strength = <20>;
111111
};
112-
113-
usb1_vbus_pin_r7: usb1_vbus_pin@0 {
114-
pins = "PG13";
115-
function = "gpio_out";
116-
};
117112
};
118113

119114
&reg_usb1_vbus {
120-
pinctrl-0 = <&usb1_vbus_pin_r7>;
121115
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
122116
status = "okay";
123117
};

‎arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161

6262
leds {
6363
compatible = "gpio-leds";
64-
pinctrl-names = "default";
65-
pinctrl-0 = <&led_pins_wobo_i5>;
6664

6765
blue {
6866
label = "a10s-wobo-i5:blue:usr";
@@ -73,8 +71,6 @@
7371

7472
reg_emac_3v3: emac-3v3 {
7573
compatible = "regulator-fixed";
76-
pinctrl-names = "default";
77-
pinctrl-0 = <&emac_power_pin_wobo>;
7874
regulator-name = "emac-3v3";
7975
regulator-min-microvolt = <3300000>;
8076
regulator-max-microvolt = <3300000>;
@@ -143,21 +139,11 @@
143139
};
144140

145141
&pio {
146-
led_pins_wobo_i5: led_pins@0 {
147-
pins = "PB2";
148-
function = "gpio_out";
149-
};
150-
151142
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
152143
pins = "PB3";
153144
function = "gpio_in";
154145
bias-pull-up;
155146
};
156-
157-
emac_power_pin_wobo: emac_power_pin@0 {
158-
pins = "PA02";
159-
function = "gpio_out";
160-
};
161147
};
162148

163149
&reg_dcdc2 {

‎arch/arm/boot/dts/sun5i-a13-hsg-h702.dts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@
144144
function = "gpio_in";
145145
bias-pull-up;
146146
};
147-
148-
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
149-
pins = "PG1";
150-
function = "gpio_in";
151-
};
152147
};
153148

154149
#include "axp209.dtsi"
@@ -202,7 +197,7 @@
202197

203198
&usbphy {
204199
pinctrl-names = "default";
205-
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
200+
pinctrl-0 = <&usb0_id_detect_pin>;
206201
usb0_id_det-gpios = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
207202
usb0_vbus_det-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
208203
usb0_vbus-supply = <&reg_usb0_vbus>;

‎arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,14 @@
135135
function = "gpio_in";
136136
bias-pull-down;
137137
};
138-
139-
usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 {
140-
pins = "PG12";
141-
function = "gpio_out";
142-
};
143-
144-
usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 {
145-
pins = "PG11";
146-
function = "gpio_out";
147-
};
148138
};
149139

150140
&reg_usb0_vbus {
151-
pinctrl-0 = <&usb0_vbus_pin_olinuxinom>;
152141
gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>;
153142
status = "okay";
154143
};
155144

156145
&reg_usb1_vbus {
157-
pinctrl-0 = <&usb1_vbus_pin_olinuxinom>;
158146
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
159147
status = "okay";
160148
};

‎arch/arm/boot/dts/sun5i-a13-olinuxino.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@
230230
function = "gpio_in";
231231
bias-pull-down;
232232
};
233-
234-
usb1_vbus_pin_olinuxino: usb1_vbus_pin@0 {
235-
pins = "PG11";
236-
function = "gpio_out";
237-
};
238233
};
239234

240235
&reg_usb0_vbus {
@@ -243,7 +238,6 @@
243238
};
244239

245240
&reg_usb1_vbus {
246-
pinctrl-0 = <&usb1_vbus_pin_olinuxino>;
247241
gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>;
248242
status = "okay";
249243
};

‎arch/arm/boot/dts/sun5i-a13-utoo-p66.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@
7979
allwinner,pa-gpios = <&pio 6 3 GPIO_ACTIVE_HIGH>; /* PG3 */
8080
};
8181

82-
&codec_pa_pin {
83-
pins = "PG3";
84-
};
85-
8682
&mmc2 {
8783
pinctrl-names = "default";
8884
pinctrl-0 = <&mmc2_pins_a>;
@@ -128,7 +124,3 @@
128124
/* The P66 uses the uart pins as gpios */
129125
status = "disabled";
130126
};
131-
132-
&usb0_vbus_pin_a {
133-
pins = "PB4";
134-
};

‎arch/arm/boot/dts/sun5i-gr8-chip-pro.dts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979

8080
mmc0_pwrseq: mmc0_pwrseq {
8181
compatible = "mmc-pwrseq-simple";
82-
pinctrl-names = "default";
83-
pinctrl-0 = <&wifi_reg_on_pin_chip_pro>;
8482
reset-gpios = <&pio 1 10 GPIO_ACTIVE_LOW>; /* PB10 */
8583
};
8684
};
@@ -157,18 +155,6 @@
157155
status = "okay";
158156
};
159157

160-
&pio {
161-
usb0_id_pin_chip_pro: usb0-id-pin@0 {
162-
pins = "PG2";
163-
function = "gpio_in";
164-
};
165-
166-
wifi_reg_on_pin_chip_pro: wifi-reg-on-pin@0 {
167-
pins = "PB10";
168-
function = "gpio_out";
169-
};
170-
};
171-
172158
&pwm {
173159
pinctrl-names = "default";
174160
pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
@@ -253,8 +239,6 @@
253239
};
254240

255241
&usbphy {
256-
pinctrl-names = "default";
257-
pinctrl-0 = <&usb0_id_pin_chip_pro>;
258242
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
259243
usb0_vbus_power-supply = <&usb_power_supply>;
260244
usb1_vbus-supply = <&reg_vcc5v0>;

‎arch/arm/boot/dts/sun5i-gr8-evb.dts

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233

234234
&mmc0 {
235235
pinctrl-names = "default";
236-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_gr8_evb>;
236+
pinctrl-0 = <&mmc0_pins_a>;
237237
vmmc-supply = <&reg_vcc3v3>;
238238
bus-width = <4>;
239239
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -256,28 +256,6 @@
256256
status = "okay";
257257
};
258258

259-
&pio {
260-
mmc0_cd_pin_gr8_evb: mmc0-cd-pin@0 {
261-
pins = "PG0";
262-
function = "gpio_in";
263-
};
264-
265-
usb0_id_pin_gr8_evb: usb0-id-pin@0 {
266-
pins = "PG2";
267-
function = "gpio_in";
268-
};
269-
270-
usb0_vbus_det_pin_gr8_evb: usb0-vbus-det-pin@0 {
271-
pins = "PG1";
272-
function = "gpio_in";
273-
};
274-
275-
usb1_vbus_pin_gr8_evb: usb1-vbus-pin@0 {
276-
pins = "PG13";
277-
function = "gpio_out";
278-
};
279-
};
280-
281259
&pwm {
282260
pinctrl-names = "default";
283261
pinctrl-0 = <&pwm0_pins>;
@@ -310,7 +288,6 @@
310288
};
311289

312290
&reg_usb1_vbus {
313-
pinctrl-0 = <&usb1_vbus_pin_gr8_evb>;
314291
gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>;
315292
status = "okay";
316293
};
@@ -356,8 +333,6 @@
356333
};
357334

358335
&usbphy {
359-
pinctrl-names = "default";
360-
pinctrl-0 = <&usb0_id_pin_gr8_evb>, <&usb0_vbus_det_pin_gr8_evb>;
361336
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */
362337
usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
363338
usb0_vbus_power-supply = <&usb_power_supply>;

‎arch/arm/boot/dts/sun5i-r8-chip.dts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
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

@@ -184,20 +182,6 @@
184182
};
185183

186184
&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-
};
201185

202186
chip_w1_pin: chip_w1_pin@0 {
203187
pins = "PD2";
@@ -260,7 +244,6 @@
260244
};
261245

262246
&reg_usb0_vbus {
263-
pinctrl-0 = <&chip_vbus_pin>;
264247
vin-supply = <&reg_vcc5v0>;
265248
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
266249
status = "okay";
@@ -303,8 +286,6 @@
303286
};
304287

305288
&usbphy {
306-
pinctrl-names = "default";
307-
pinctrl-0 = <&chip_id_det_pin>;
308289
status = "okay";
309290

310291
usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */

0 commit comments

Comments
 (0)