Skip to content

Commit 79badc7

Browse files
mripardmripard
committed
ARM: dts: sun5i: Remove card detect pull-up
Boards usually have an external pull-up on the card-detect signal, so there's no need to add another one. This also removes a DTC warning. Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com> Acked-by: Chen-Yu Tsai <wens@csie.org>
1 parent f606c4b commit 79badc7

11 files changed

+12
-88
lines changed

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

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

9191
&mmc0 {
9292
pinctrl-names = "default";
93-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>;
93+
pinctrl-0 = <&mmc0_pins_a>;
9494
vmmc-supply = <&reg_vcc3v3>;
9595
bus-width = <4>;
9696
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -106,12 +106,6 @@
106106
};
107107

108108
&pio {
109-
mmc0_cd_pin_t003: mmc0_cd_pin@0 {
110-
pins = "PG1";
111-
function = "gpio_in";
112-
bias-pull-up;
113-
};
114-
115109
led_pins_t003: led_pins@0 {
116110
pins = "PB2";
117111
function = "gpio_out";

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
&mmc0 {
101101
pinctrl-names = "default";
102-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
102+
pinctrl-0 = <&mmc0_pins_a>;
103103
vmmc-supply = <&reg_vcc3v3>;
104104
bus-width = <4>;
105105
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -131,12 +131,6 @@
131131
bias-pull-up;
132132
};
133133

134-
mmc0_cd_pin_t004: mmc0_cd_pin@0 {
135-
pins = "PG1";
136-
function = "gpio_in";
137-
bias-pull-up;
138-
};
139-
140134
led_pins_t004: led_pins@0 {
141135
pins = "PB2";
142136
function = "gpio_out";

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
&mmc0 {
8989
pinctrl-names = "default";
90-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
90+
pinctrl-0 = <&mmc0_pins_a>;
9191
vmmc-supply = <&reg_vcc3v3>;
9292
bus-width = <4>;
9393
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -111,14 +111,6 @@
111111
status = "okay";
112112
};
113113

114-
&pio {
115-
mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
116-
pins = "PG1";
117-
function = "gpio_in";
118-
bias-pull-up;
119-
};
120-
};
121-
122114
&reg_usb1_vbus {
123115
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
124116
status = "okay";

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198

199199
&mmc0 {
200200
pinctrl-names = "default";
201-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
201+
pinctrl-0 = <&mmc0_pins_a>;
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>, <&mmc1_cd_pin_olinuxino_micro>;
210+
pinctrl-0 = <&mmc1_pins_a>;
211211
vmmc-supply = <&reg_vcc3v3>;
212212
bus-width = <4>;
213213
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
@@ -223,18 +223,6 @@
223223
};
224224

225225
&pio {
226-
mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
227-
pins = "PG1";
228-
function = "gpio_in";
229-
bias-pull-up;
230-
};
231-
232-
mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
233-
pins = "PG13";
234-
function = "gpio_in";
235-
bias-pull-up;
236-
};
237-
238226
led_pins_olinuxino: led_pins@0 {
239227
pins = "PE3";
240228
function = "gpio_out";

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

Lines changed: 1 addition & 7 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>, <&mmc0_cd_pin_r7>;
80+
pinctrl-0 = <&mmc0_pins_a>;
8181
vmmc-supply = <&reg_vcc3v3>;
8282
bus-width = <4>;
8383
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -98,12 +98,6 @@
9898
};
9999

100100
&pio {
101-
mmc0_cd_pin_r7: mmc0_cd_pin@0 {
102-
pins = "PG1";
103-
function = "gpio_in";
104-
bias-pull-up;
105-
};
106-
107101
led_pins_r7: led_pins@0 {
108102
pins = "PB2";
109103
function = "gpio_out";

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123

124124
&mmc0 {
125125
pinctrl-names = "default";
126-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
126+
pinctrl-0 = <&mmc0_pins_a>;
127127
vmmc-supply = <&reg_vcc3v3>;
128128
bus-width = <4>;
129129
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
@@ -138,14 +138,6 @@
138138
status = "okay";
139139
};
140140

141-
&pio {
142-
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
143-
pins = "PB3";
144-
function = "gpio_in";
145-
bias-pull-up;
146-
};
147-
};
148-
149141
&reg_dcdc2 {
150142
regulator-always-on;
151143
regulator-min-microvolt = <1000000>;

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
&mmc0 {
124124
pinctrl-names = "default";
125-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
125+
pinctrl-0 = <&mmc0_pins_a>;
126126
vmmc-supply = <&reg_vcc3v3>;
127127
bus-width = <4>;
128128
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -134,12 +134,6 @@
134134
};
135135

136136
&pio {
137-
mmc0_cd_pin_d709: mmc0_cd_pin@0 {
138-
pins = "PG0";
139-
function = "gpio_in";
140-
bias-pull-up;
141-
};
142-
143137
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
144138
pins = "PG1";
145139
function = "gpio_in";

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
&mmc0 {
119119
pinctrl-names = "default";
120-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
120+
pinctrl-0 = <&mmc0_pins_a>;
121121
vmmc-supply = <&reg_vcc3v3>;
122122
bus-width = <4>;
123123
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
133133
};
134134

135135
&pio {
136-
mmc0_cd_pin_h702: mmc0_cd_pin@0 {
137-
pins = "PG0";
138-
function = "gpio_in";
139-
bias-pull-up;
140-
};
141-
142136
usb0_id_detect_pin: usb0_id_detect_pin@0 {
143137
pins = "PG2";
144138
function = "gpio_in";

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
&mmc0 {
9898
pinctrl-names = "default";
99-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
99+
pinctrl-0 = <&mmc0_pins_a>;
100100
vmmc-supply = <&reg_vcc3v3>;
101101
bus-width = <4>;
102102
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -112,12 +112,6 @@
112112
};
113113

114114
&pio {
115-
mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
116-
pins = "PG0";
117-
function = "gpio_in";
118-
bias-pull-up;
119-
};
120-
121115
led_pins_olinuxinom: led_pins@0 {
122116
pins = "PG9";
123117
function = "gpio_out";

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191

192192
&mmc0 {
193193
pinctrl-names = "default";
194-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
194+
pinctrl-0 = <&mmc0_pins_a>;
195195
vmmc-supply = <&reg_vcc3v3>;
196196
bus-width = <4>;
197197
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -207,12 +207,6 @@
207207
};
208208

209209
&pio {
210-
mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
211-
pins = "PG0";
212-
function = "gpio_in";
213-
bias-pull-up;
214-
};
215-
216210
led_pins_olinuxino: led_pins@0 {
217211
pins = "PG9";
218212
function = "gpio_out";

‎arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121

122122
&mmc0 {
123123
pinctrl-names = "default";
124-
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
124+
pinctrl-0 = <&mmc0_pins_a>;
125125
vmmc-supply = <&reg_vcc3v0>;
126126
bus-width = <4>;
127127
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
133133
};
134134

135135
&pio {
136-
mmc0_cd_pin: mmc0_cd_pin@0 {
137-
pins = "PG0";
138-
function = "gpio_in";
139-
bias-pull-up;
140-
};
141-
142136
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
143137
pins = "PG1";
144138
function = "gpio_in";

0 commit comments

Comments
 (0)