Skip to content

L
linux
Commit 79badc74 authored by Maxime Ripard's avatar Maxime Ripard
Browse files
Options

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: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent f606c4b3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 88 deletions
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View file @ 79badc74
...@@ -90,7 +90,7 @@ axp152: pmic@30 { ...@@ -90,7 +90,7 @@ axp152: pmic@30 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -106,12 +106,6 @@ &otg_sram { ...@@ -106,12 +106,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_t003: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
led_pins_t003: led_pins@0 { led_pins_t003: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View file @ 79badc74
...@@ -99,7 +99,7 @@ axp152: pmic@30 { ...@@ -99,7 +99,7 @@ axp152: pmic@30 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -131,12 +131,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -131,12 +131,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_t004: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
led_pins_t004: led_pins@0 { led_pins_t004: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-a10s-mk802.dts
View file @ 79badc74
...@@ -87,7 +87,7 @@ axp152: pmic@30 { ...@@ -87,7 +87,7 @@ axp152: pmic@30 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -111,14 +111,6 @@ &otg_sram { ...@@ -111,14 +111,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */ gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
status = "okay"; status = "okay";
......
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View file @ 79badc74
...@@ -198,7 +198,7 @@ phy1: ethernet-phy@1 { ...@@ -198,7 +198,7 @@ phy1: ethernet-phy@1 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -207,7 +207,7 @@ &mmc0 { ...@@ -207,7 +207,7 @@ &mmc0 {
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>; pinctrl-0 = <&mmc1_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */ cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
...@@ -223,18 +223,6 @@ &otg_sram { ...@@ -223,18 +223,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
pins = "PG13";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 { led_pins_olinuxino: led_pins@0 {
pins = "PE3"; pins = "PE3";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
View file @ 79badc74
...@@ -77,7 +77,7 @@ &ehci0 { ...@@ -77,7 +77,7 @@ &ehci0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */ cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
...@@ -98,12 +98,6 @@ &ohci0 { ...@@ -98,12 +98,6 @@ &ohci0 {
}; };
&pio { &pio {
mmc0_cd_pin_r7: mmc0_cd_pin@0 {
pins = "PG1";
function = "gpio_in";
bias-pull-up;
};
led_pins_r7: led_pins@0 { led_pins_r7: led_pins@0 {
pins = "PB2"; pins = "PB2";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View file @ 79badc74
...@@ -123,7 +123,7 @@ phy1: ethernet-phy@1 { ...@@ -123,7 +123,7 @@ phy1: ethernet-phy@1 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */ cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
...@@ -138,14 +138,6 @@ &otg_sram { ...@@ -138,14 +138,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
pins = "PB3";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
......
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ 79badc74
...@@ -122,7 +122,7 @@ button-400 { ...@@ -122,7 +122,7 @@ button-400 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -134,12 +134,6 @@ &otg_sram { ...@@ -134,12 +134,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_d709: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ 79badc74
...@@ -117,7 +117,7 @@ button-400 { ...@@ -117,7 +117,7 @@ button-400 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -133,12 +133,6 @@ &otg_sram { ...@@ -133,12 +133,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_h702: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PG2"; pins = "PG2";
function = "gpio_in"; function = "gpio_in";
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ 79badc74
...@@ -96,7 +96,7 @@ &i2c2 { ...@@ -96,7 +96,7 @@ &i2c2 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -112,12 +112,6 @@ &otg_sram { ...@@ -112,12 +112,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxinom: led_pins@0 { led_pins_olinuxinom: led_pins@0 {
pins = "PG9"; pins = "PG9";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ 79badc74
...@@ -191,7 +191,7 @@ button-987 { ...@@ -191,7 +191,7 @@ button-987 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -207,12 +207,6 @@ &otg_sram { ...@@ -207,12 +207,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 { led_pins_olinuxino: led_pins@0 {
pins = "PG9"; pins = "PG9";
function = "gpio_out"; function = "gpio_out";
......
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
View file @ 79badc74
...@@ -121,7 +121,7 @@ &lradc { ...@@ -121,7 +121,7 @@ &lradc {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */ cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
...@@ -133,12 +133,6 @@ &otg_sram { ...@@ -133,12 +133,6 @@ &otg_sram {
}; };
&pio { &pio {
mmc0_cd_pin: mmc0_cd_pin@0 {
pins = "PG0";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PG1"; pins = "PG1";
function = "gpio_in"; function = "gpio_in";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7