Commit 8860687a authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun7i: 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 054da074
...@@ -175,7 +175,7 @@ &ir0 { ...@@ -175,7 +175,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m1p>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -220,14 +220,6 @@ &otg_sram { ...@@ -220,14 +220,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
......
...@@ -177,7 +177,7 @@ &ir0 { ...@@ -177,7 +177,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -253,12 +253,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -253,12 +253,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
......
...@@ -149,7 +149,7 @@ &ir0 { ...@@ -149,7 +149,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapro>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -182,14 +182,6 @@ &ohci1 { ...@@ -182,14 +182,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */ gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */
status = "okay"; status = "okay";
......
...@@ -220,7 +220,7 @@ &ir0 { ...@@ -220,7 +220,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_lamobo_r1>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -241,12 +241,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -241,12 +241,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
}; };
#include "axp209.dtsi" #include "axp209.dtsi"
......
...@@ -219,7 +219,7 @@ &mmc0 { ...@@ -219,7 +219,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>; pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */ cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
...@@ -244,12 +244,6 @@ led_pins_olimex_som_evb: led_pins@0 { ...@@ -244,12 +244,6 @@ led_pins_olimex_som_evb: led_pins@0 {
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {
pins = "PH0";
function = "gpio_in";
bias-pull-up;
};
}; };
&reg_ahci_5v { &reg_ahci_5v {
......
...@@ -232,7 +232,7 @@ &mmc0 { ...@@ -232,7 +232,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olinuxinom>; pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -257,12 +257,6 @@ gmac_txerr: gmac_txerr@0 { ...@@ -257,12 +257,6 @@ gmac_txerr: gmac_txerr@0 {
function = "gmac"; function = "gmac";
}; };
mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
pins = "PH11";
function = "gpio_in";
bias-pull-up;
};
led_pins_olinuxino: led_pins@0 { led_pins_olinuxino: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
......
...@@ -162,7 +162,7 @@ &ir0 { ...@@ -162,7 +162,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -171,7 +171,7 @@ &mmc0 { ...@@ -171,7 +171,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_orangepi>; pinctrl-0 = <&mmc3_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -188,18 +188,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -188,18 +188,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
mmc3_cd_pin_orangepi: mmc3_cd_pin@0 {
pins = "PH11";
function = "gpio_in";
bias-pull-up;
};
}; };
&reg_dcdc2 { &reg_dcdc2 {
......
...@@ -128,7 +128,7 @@ &ir0 { ...@@ -128,7 +128,7 @@ &ir0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_orangepi>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -145,12 +145,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -145,12 +145,6 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_orangepi: mmc0_cd_pin@0 {
pins = "PH10";
function = "gpio_in";
bias-pull-up;
};
}; };
&reg_dcdc2 { &reg_dcdc2 {
......
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