Skip to content

Commit 6a9951a

Browse files
mripardmripard
committed
ARM: dts: sun5i: Change pinctrl nodes to avoid warning
All our pinctrl nodes were using a node name convention with a unit-address to differentiate the different muxing options. However, since those nodes didn't have a reg property, they were generating warnings in DTC. In order to accomodate for this, convert the old nodes to the syntax we've been using for the new SoCs, including removing the letter suffix of the node labels to the bank of those pins to make things more readable. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
1 parent 79badc7 commit 6a9951a

19 files changed

+127
-119
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
&i2c0 {
7878
pinctrl-names = "default";
79-
pinctrl-0 = <&i2c0_pins_a>;
79+
pinctrl-0 = <&i2c0_pins>;
8080
status = "okay";
8181

8282
axp152: pmic@30 {
@@ -90,7 +90,7 @@
9090

9191
&mmc0 {
9292
pinctrl-names = "default";
93-
pinctrl-0 = <&mmc0_pins_a>;
93+
pinctrl-0 = <&mmc0_pins>;
9494
vmmc-supply = <&reg_vcc3v3>;
9595
bus-width = <4>;
9696
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -125,7 +125,7 @@
125125

126126
&uart0 {
127127
pinctrl-names = "default";
128-
pinctrl-0 = <&uart0_pins_a>;
128+
pinctrl-0 = <&uart0_pb_pins>;
129129
status = "okay";
130130
};
131131

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
&i2c0 {
8787
pinctrl-names = "default";
88-
pinctrl-0 = <&i2c0_pins_a>;
88+
pinctrl-0 = <&i2c0_pins>;
8989
status = "okay";
9090

9191
axp152: pmic@30 {
@@ -99,7 +99,7 @@
9999

100100
&mmc0 {
101101
pinctrl-names = "default";
102-
pinctrl-0 = <&mmc0_pins_a>;
102+
pinctrl-0 = <&mmc0_pins>;
103103
vmmc-supply = <&reg_vcc3v3>;
104104
bus-width = <4>;
105105
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -108,7 +108,7 @@
108108

109109
&mmc1 {
110110
pinctrl-names = "default";
111-
pinctrl-0 = <&mmc1_pins_a>;
111+
pinctrl-0 = <&mmc1_pins>;
112112
vmmc-supply = <&reg_vmmc1>;
113113
bus-width = <4>;
114114
non-removable;
@@ -145,7 +145,7 @@
145145

146146
&uart0 {
147147
pinctrl-names = "default";
148-
pinctrl-0 = <&uart0_pins_a>;
148+
pinctrl-0 = <&uart0_pb_pins>;
149149
status = "okay";
150150
};
151151

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373

7474
&i2c0 {
7575
pinctrl-names = "default";
76-
pinctrl-0 = <&i2c0_pins_a>;
76+
pinctrl-0 = <&i2c0_pins>;
7777
status = "okay";
7878

7979
axp152: pmic@30 {
@@ -87,7 +87,7 @@
8787

8888
&mmc0 {
8989
pinctrl-names = "default";
90-
pinctrl-0 = <&mmc0_pins_a>;
90+
pinctrl-0 = <&mmc0_pins>;
9191
vmmc-supply = <&reg_vcc3v3>;
9292
bus-width = <4>;
9393
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -96,7 +96,7 @@
9696

9797
&mmc1 {
9898
pinctrl-names = "default";
99-
pinctrl-0 = <&mmc1_pins_a>;
99+
pinctrl-0 = <&mmc1_pins>;
100100
vmmc-supply = <&reg_vcc3v3>;
101101
bus-width = <4>;
102102
non-removable;
@@ -118,7 +118,7 @@
118118

119119
&uart0 {
120120
pinctrl-names = "default";
121-
pinctrl-0 = <&uart0_pins_a>;
121+
pinctrl-0 = <&uart0_pb_pins>;
122122
status = "okay";
123123
};
124124

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797

9898
&emac {
9999
pinctrl-names = "default";
100-
pinctrl-0 = <&emac_pins_b>;
100+
pinctrl-0 = <&emac_pa_pins>;
101101
phy = <&phy1>;
102102
status = "okay";
103103
};
@@ -118,7 +118,7 @@
118118

119119
&i2c0 {
120120
pinctrl-names = "default";
121-
pinctrl-0 = <&i2c0_pins_a>;
121+
pinctrl-0 = <&i2c0_pins>;
122122
status = "okay";
123123

124124
axp152: pmic@30 {
@@ -131,7 +131,7 @@
131131

132132
&i2c1 {
133133
pinctrl-names = "default";
134-
pinctrl-0 = <&i2c1_pins_a>;
134+
pinctrl-0 = <&i2c1_pins>;
135135
status = "okay";
136136

137137
at24@50 {
@@ -144,7 +144,7 @@
144144

145145
&i2c2 {
146146
pinctrl-names = "default";
147-
pinctrl-0 = <&i2c2_pins_a>;
147+
pinctrl-0 = <&i2c2_pins>;
148148
status = "okay";
149149
};
150150

@@ -198,7 +198,7 @@
198198

199199
&mmc0 {
200200
pinctrl-names = "default";
201-
pinctrl-0 = <&mmc0_pins_a>;
201+
pinctrl-0 = <&mmc0_pins>;
202202
vmmc-supply = <&reg_vcc3v3>;
203203
bus-width = <4>;
204204
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -207,7 +207,7 @@
207207

208208
&mmc1 {
209209
pinctrl-names = "default";
210-
pinctrl-0 = <&mmc1_pins_a>;
210+
pinctrl-0 = <&mmc1_pins>;
211211
vmmc-supply = <&reg_vcc3v3>;
212212
bus-width = <4>;
213213
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
@@ -248,8 +248,8 @@
248248

249249
&spi2 {
250250
pinctrl-names = "default";
251-
pinctrl-0 = <&spi2_pins_b>,
252-
<&spi2_cs0_pins_b>;
251+
pinctrl-0 = <&spi2_pb_pins>,
252+
<&spi2_cs0_pb_pin>;
253253
status = "okay";
254254
};
255255

@@ -259,19 +259,19 @@
259259

260260
&uart0 {
261261
pinctrl-names = "default";
262-
pinctrl-0 = <&uart0_pins_a>;
262+
pinctrl-0 = <&uart0_pb_pins>;
263263
status = "okay";
264264
};
265265

266266
&uart2 {
267267
pinctrl-names = "default";
268-
pinctrl-0 = <&uart2_pins_b>;
268+
pinctrl-0 = <&uart2_pc_pins>;
269269
status = "okay";
270270
};
271271

272272
&uart3 {
273273
pinctrl-names = "default";
274-
pinctrl-0 = <&uart3_pins_a>;
274+
pinctrl-0 = <&uart3_pg_pins>;
275275
status = "okay";
276276
};
277277

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
&mmc0 {
7979
pinctrl-names = "default";
80-
pinctrl-0 = <&mmc0_pins_a>;
80+
pinctrl-0 = <&mmc0_pins>;
8181
vmmc-supply = <&reg_vcc3v3>;
8282
bus-width = <4>;
8383
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -86,7 +86,7 @@
8686

8787
&mmc1 {
8888
pinctrl-names = "default";
89-
pinctrl-0 = <&mmc1_pins_a>;
89+
pinctrl-0 = <&mmc1_pins>;
9090
vmmc-supply = <&reg_vcc3v3>;
9191
bus-width = <4>;
9292
non-removable;
@@ -112,7 +112,7 @@
112112

113113
&uart0 {
114114
pinctrl-names = "default";
115-
pinctrl-0 = <&uart0_pins_a>;
115+
pinctrl-0 = <&uart0_pb_pins>;
116116
status = "okay";
117117
};
118118

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090

9191
&emac {
9292
pinctrl-names = "default";
93-
pinctrl-0 = <&emac_pins_a>;
93+
pinctrl-0 = <&emac_pd_pins>;
9494
phy = <&phy1>;
9595
status = "okay";
9696
};
@@ -101,7 +101,7 @@
101101

102102
&i2c0 {
103103
pinctrl-names = "default";
104-
pinctrl-0 = <&i2c0_pins_a>;
104+
pinctrl-0 = <&i2c0_pins>;
105105
status = "okay";
106106

107107
axp209: pmic@34 {
@@ -123,7 +123,7 @@
123123

124124
&mmc0 {
125125
pinctrl-names = "default";
126-
pinctrl-0 = <&mmc0_pins_a>;
126+
pinctrl-0 = <&mmc0_pins>;
127127
vmmc-supply = <&reg_vcc3v3>;
128128
bus-width = <4>;
129129
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
@@ -184,7 +184,7 @@
184184

185185
&uart0 {
186186
pinctrl-names = "default";
187-
pinctrl-0 = <&uart0_pins_a>;
187+
pinctrl-0 = <&uart0_pb_pins>;
188188
status = "okay";
189189
};
190190

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@
124124
&pio {
125125
compatible = "allwinner,sun5i-a10s-pinctrl";
126126

127-
uart0_pins_a: uart0@0 {
127+
uart0_pb_pins: uart0-pb-pins {
128128
pins = "PB19", "PB20";
129129
function = "uart0";
130130
};
131131

132-
uart2_pins_b: uart2@1 {
132+
uart2_pc_pins: uart2-pc-pins {
133133
pins = "PC18", "PC19";
134134
function = "uart2";
135135
};
136136

137-
emac_pins_b: emac0@1 {
137+
emac_pa_pins: emac-pa-pins {
138138
pins = "PA0", "PA1", "PA2",
139139
"PA3", "PA4", "PA5", "PA6",
140140
"PA7", "PA8", "PA9", "PA10",
@@ -143,19 +143,19 @@
143143
function = "emac";
144144
};
145145

146-
mmc1_pins_a: mmc1@0 {
146+
mmc1_pins: mmc1-pins {
147147
pins = "PG3", "PG4", "PG5",
148148
"PG6", "PG7", "PG8";
149149
function = "mmc1";
150150
drive-strength = <30>;
151151
};
152152

153-
spi2_pins_b: spi2@1 {
153+
spi2_pb_pins: spi2-pb-pins {
154154
pins = "PB12", "PB13", "PB14";
155155
function = "spi2";
156156
};
157157

158-
spi2_cs0_pins_b: spi2_cs0@1 {
158+
spi2_cs0_pb_pin: spi2-cs0-pb-pin {
159159
pins = "PB11";
160160
function = "spi2";
161161
};

‎arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
&i2c0 {
8181
pinctrl-names = "default";
82-
pinctrl-0 = <&i2c0_pins_a>;
82+
pinctrl-0 = <&i2c0_pins>;
8383
status = "okay";
8484

8585
axp209: pmic@34 {
@@ -92,7 +92,7 @@
9292

9393
&i2c1 {
9494
pinctrl-names = "default";
95-
pinctrl-0 = <&i2c1_pins_a>;
95+
pinctrl-0 = <&i2c1_pins>;
9696
status = "okay";
9797

9898
pcf8563: rtc@51 {
@@ -122,7 +122,7 @@
122122

123123
&mmc0 {
124124
pinctrl-names = "default";
125-
pinctrl-0 = <&mmc0_pins_a>;
125+
pinctrl-0 = <&mmc0_pins>;
126126
vmmc-supply = <&reg_vcc3v3>;
127127
bus-width = <4>;
128128
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -149,7 +149,7 @@
149149

150150
&pwm {
151151
pinctrl-names = "default";
152-
pinctrl-0 = <&pwm0_pins>;
152+
pinctrl-0 = <&pwm0_pin>;
153153
status = "okay";
154154
};
155155

@@ -191,7 +191,7 @@
191191

192192
&uart1 {
193193
pinctrl-names = "default";
194-
pinctrl-0 = <&uart1_pins_b>;
194+
pinctrl-0 = <&uart1_pg_pins>;
195195
status = "okay";
196196
};
197197

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
&i2c0 {
7272
pinctrl-names = "default";
73-
pinctrl-0 = <&i2c0_pins_a>;
73+
pinctrl-0 = <&i2c0_pins>;
7474
status = "okay";
7575

7676
axp209: pmic@34 {
@@ -81,7 +81,7 @@
8181

8282
&i2c1 {
8383
pinctrl-names = "default";
84-
pinctrl-0 = <&i2c1_pins_a>;
84+
pinctrl-0 = <&i2c1_pins>;
8585
status = "okay";
8686

8787
pcf8563: rtc@51 {
@@ -92,7 +92,7 @@
9292

9393
&i2c2 {
9494
pinctrl-names = "default";
95-
pinctrl-0 = <&i2c2_pins_a>;
95+
pinctrl-0 = <&i2c2_pins>;
9696
status = "okay";
9797
};
9898

@@ -117,7 +117,7 @@
117117

118118
&mmc0 {
119119
pinctrl-names = "default";
120-
pinctrl-0 = <&mmc0_pins_a>;
120+
pinctrl-0 = <&mmc0_pins>;
121121
vmmc-supply = <&reg_vcc3v3>;
122122
bus-width = <4>;
123123
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -180,7 +180,7 @@
180180

181181
&uart1 {
182182
pinctrl-names = "default";
183-
pinctrl-0 = <&uart1_pins_b>;
183+
pinctrl-0 = <&uart1_pg_pins>;
184184
status = "okay";
185185
};
186186

0 commit comments

Comments
 (0)