Skip to content

Commit 1eb3927

Browse files
mripardmripard
committed
ARM: dts: sun5i: Provide default muxing for relevant controllers
The I2C's, MMC0 and MMC1 controllers have only one muxing option in the SoC. In such a case, we can just move the muxing into the DTSI, and remove it from the DTS. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
1 parent a45207c commit 1eb3927

16 files changed

+13
-94
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
};
7676

7777
&i2c0 {
78-
pinctrl-names = "default";
79-
pinctrl-0 = <&i2c0_pins>;
8078
status = "okay";
8179

8280
axp152: pmic@30 {
@@ -89,8 +87,6 @@
8987
};
9088

9189
&mmc0 {
92-
pinctrl-names = "default";
93-
pinctrl-0 = <&mmc0_pins>;
9490
vmmc-supply = <&reg_vcc3v3>;
9591
bus-width = <4>;
9692
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@
8484
};
8585

8686
&i2c0 {
87-
pinctrl-names = "default";
88-
pinctrl-0 = <&i2c0_pins>;
8987
status = "okay";
9088

9189
axp152: pmic@30 {
@@ -98,17 +96,13 @@
9896
};
9997

10098
&mmc0 {
101-
pinctrl-names = "default";
102-
pinctrl-0 = <&mmc0_pins>;
10399
vmmc-supply = <&reg_vcc3v3>;
104100
bus-width = <4>;
105101
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
106102
status = "okay";
107103
};
108104

109105
&mmc1 {
110-
pinctrl-names = "default";
111-
pinctrl-0 = <&mmc1_pins>;
112106
vmmc-supply = <&reg_vmmc1>;
113107
bus-width = <4>;
114108
non-removable;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
};
7373

7474
&i2c0 {
75-
pinctrl-names = "default";
76-
pinctrl-0 = <&i2c0_pins>;
7775
status = "okay";
7876

7977
axp152: pmic@30 {
@@ -86,17 +84,13 @@
8684
};
8785

8886
&mmc0 {
89-
pinctrl-names = "default";
90-
pinctrl-0 = <&mmc0_pins>;
9187
vmmc-supply = <&reg_vcc3v3>;
9288
bus-width = <4>;
9389
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
9490
status = "okay";
9591
};
9692

9793
&mmc1 {
98-
pinctrl-names = "default";
99-
pinctrl-0 = <&mmc1_pins>;
10094
vmmc-supply = <&reg_vcc3v3>;
10195
bus-width = <4>;
10296
non-removable;

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@
117117
};
118118

119119
&i2c0 {
120-
pinctrl-names = "default";
121-
pinctrl-0 = <&i2c0_pins>;
122120
status = "okay";
123121

124122
axp152: pmic@30 {
@@ -130,8 +128,6 @@
130128
#include "axp152.dtsi"
131129

132130
&i2c1 {
133-
pinctrl-names = "default";
134-
pinctrl-0 = <&i2c1_pins>;
135131
status = "okay";
136132

137133
at24@50 {
@@ -143,8 +139,6 @@
143139
};
144140

145141
&i2c2 {
146-
pinctrl-names = "default";
147-
pinctrl-0 = <&i2c2_pins>;
148142
status = "okay";
149143
};
150144

@@ -197,17 +191,13 @@
197191
};
198192

199193
&mmc0 {
200-
pinctrl-names = "default";
201-
pinctrl-0 = <&mmc0_pins>;
202194
vmmc-supply = <&reg_vcc3v3>;
203195
bus-width = <4>;
204196
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
205197
status = "okay";
206198
};
207199

208200
&mmc1 {
209-
pinctrl-names = "default";
210-
pinctrl-0 = <&mmc1_pins>;
211201
vmmc-supply = <&reg_vcc3v3>;
212202
bus-width = <4>;
213203
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,13 @@
7676
};
7777

7878
&mmc0 {
79-
pinctrl-names = "default";
80-
pinctrl-0 = <&mmc0_pins>;
8179
vmmc-supply = <&reg_vcc3v3>;
8280
bus-width = <4>;
8381
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
8482
status = "okay";
8583
};
8684

8785
&mmc1 {
88-
pinctrl-names = "default";
89-
pinctrl-0 = <&mmc1_pins>;
9086
vmmc-supply = <&reg_vcc3v3>;
9187
bus-width = <4>;
9288
non-removable;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
};
101101

102102
&i2c0 {
103-
pinctrl-names = "default";
104-
pinctrl-0 = <&i2c0_pins>;
105103
status = "okay";
106104

107105
axp209: pmic@34 {
@@ -122,8 +120,6 @@
122120
};
123121

124122
&mmc0 {
125-
pinctrl-names = "default";
126-
pinctrl-0 = <&mmc0_pins>;
127123
vmmc-supply = <&reg_vcc3v3>;
128124
bus-width = <4>;
129125
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
compatible = "allwinner,sun5i-a10s-ccu";
120120
};
121121

122+
&mmc1 {
123+
pinctrl-names = "default";
124+
pinctrl-0 = <&mmc1_pins>;
125+
};
126+
122127
&pio {
123128
compatible = "allwinner,sun5i-a10s-pinctrl";
124129

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
};
7979

8080
&i2c0 {
81-
pinctrl-names = "default";
82-
pinctrl-0 = <&i2c0_pins>;
8381
status = "okay";
8482

8583
axp209: pmic@34 {
@@ -91,8 +89,6 @@
9189
#include "axp209.dtsi"
9290

9391
&i2c1 {
94-
pinctrl-names = "default";
95-
pinctrl-0 = <&i2c1_pins>;
9692
status = "okay";
9793

9894
pcf8563: rtc@51 {
@@ -121,8 +117,6 @@
121117
};
122118

123119
&mmc0 {
124-
pinctrl-names = "default";
125-
pinctrl-0 = <&mmc0_pins>;
126120
vmmc-supply = <&reg_vcc3v3>;
127121
bus-width = <4>;
128122
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@
6969
};
7070

7171
&i2c0 {
72-
pinctrl-names = "default";
73-
pinctrl-0 = <&i2c0_pins>;
7472
status = "okay";
7573

7674
axp209: pmic@34 {
@@ -80,8 +78,6 @@
8078
};
8179

8280
&i2c1 {
83-
pinctrl-names = "default";
84-
pinctrl-0 = <&i2c1_pins>;
8581
status = "okay";
8682

8783
pcf8563: rtc@51 {
@@ -91,8 +87,6 @@
9187
};
9288

9389
&i2c2 {
94-
pinctrl-names = "default";
95-
pinctrl-0 = <&i2c2_pins>;
9690
status = "okay";
9791
};
9892

@@ -116,8 +110,6 @@
116110
};
117111

118112
&mmc0 {
119-
pinctrl-names = "default";
120-
pinctrl-0 = <&mmc0_pins>;
121113
vmmc-supply = <&reg_vcc3v3>;
122114
bus-width = <4>;
123115
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */

‎arch/arm/boot/dts/sun5i-a13-licheepi-one.dts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@
9494
};
9595

9696
&i2c0 {
97-
pinctrl-names = "default";
98-
pinctrl-0 = <&i2c0_pins>;
9997
status = "okay";
10098

10199
axp209: pmic@34 {
@@ -109,14 +107,10 @@
109107
};
110108

111109
&i2c1 {
112-
pinctrl-names = "default";
113-
pinctrl-0 = <&i2c1_pins>;
114110
status = "disabled";
115111
};
116112

117113
&i2c2 {
118-
pinctrl-names = "default";
119-
pinctrl-0 = <&i2c2_pins>;
120114
status = "disabled";
121115
};
122116

@@ -133,8 +127,6 @@
133127
};
134128

135129
&mmc0 {
136-
pinctrl-names = "default";
137-
pinctrl-0 = <&mmc0_pins>;
138130
vmmc-supply = <&reg_vcc3v3>;
139131
bus-width = <4>;
140132
broken-cd;

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,18 @@
7777
};
7878

7979
&i2c0 {
80-
pinctrl-names = "default";
81-
pinctrl-0 = <&i2c0_pins>;
8280
status = "okay";
8381
};
8482

8583
&i2c1 {
86-
pinctrl-names = "default";
87-
pinctrl-0 = <&i2c1_pins>;
8884
status = "okay";
8985
};
9086

9187
&i2c2 {
92-
pinctrl-names = "default";
93-
pinctrl-0 = <&i2c2_pins>;
9488
status = "okay";
9589
};
9690

9791
&mmc0 {
98-
pinctrl-names = "default";
99-
pinctrl-0 = <&mmc0_pins>;
10092
vmmc-supply = <&reg_vcc3v3>;
10193
bus-width = <4>;
10294
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@
123123
};
124124

125125
&i2c0 {
126-
pinctrl-names = "default";
127-
pinctrl-0 = <&i2c0_pins>;
128126
status = "okay";
129127

130128
axp209: pmic@34 {
@@ -138,14 +136,10 @@
138136
};
139137

140138
&i2c1 {
141-
pinctrl-names = "default";
142-
pinctrl-0 = <&i2c1_pins>;
143139
status = "okay";
144140
};
145141

146142
&i2c2 {
147-
pinctrl-names = "default";
148-
pinctrl-0 = <&i2c2_pins>;
149143
status = "okay";
150144
};
151145

@@ -190,8 +184,6 @@
190184
};
191185

192186
&mmc0 {
193-
pinctrl-names = "default";
194-
pinctrl-0 = <&mmc0_pins>;
195187
vmmc-supply = <&reg_vcc3v3>;
196188
bus-width = <4>;
197189
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@
9292
};
9393

9494
&i2c0 {
95-
pinctrl-names = "default";
96-
pinctrl-0 = <&i2c0_pins>;
9795
status = "okay";
9896

9997
axp209: pmic@34 {
@@ -112,8 +110,6 @@
112110
#include "axp209.dtsi"
113111

114112
&i2c1 {
115-
pinctrl-names = "default";
116-
pinctrl-0 = <&i2c1_pins>;
117113
status = "disabled";
118114
};
119115

@@ -124,8 +120,6 @@
124120
};
125121

126122
&mmc0 {
127-
pinctrl-names = "default";
128-
pinctrl-0 = <&mmc0_pins>;
129123
vmmc-supply = <&reg_vcc3v3>;
130124
mmc-pwrseq = <&mmc0_pwrseq>;
131125
bus-width = <4>;

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@
123123
};
124124

125125
&i2c0 {
126-
pinctrl-names = "default";
127-
pinctrl-0 = <&i2c0_pins>;
128126
status = "okay";
129127

130128
axp209: pmic@34 {
@@ -143,8 +141,6 @@
143141
#include "axp209.dtsi"
144142

145143
&i2c1 {
146-
pinctrl-names = "default";
147-
pinctrl-0 = <&i2c1_pins>;
148144
status = "okay";
149145

150146
wm8978: codec@1a {
@@ -160,8 +156,6 @@
160156
};
161157

162158
&i2c2 {
163-
pinctrl-names = "default";
164-
pinctrl-0 = <&i2c2_pins>;
165159
status = "okay";
166160
};
167161

@@ -232,8 +226,6 @@
232226
};
233227

234228
&mmc0 {
235-
pinctrl-names = "default";
236-
pinctrl-0 = <&mmc0_pins>;
237229
vmmc-supply = <&reg_vcc3v3>;
238230
bus-width = <4>;
239231
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */

0 commit comments

Comments
 (0)