Commit d491714e authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun6i: 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 8f9e1052
...@@ -114,7 +114,7 @@ mma8452: mma8452@1d { ...@@ -114,7 +114,7 @@ mma8452: mma8452@1d {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_colombus>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -126,12 +126,6 @@ &mmc0_pins_a { ...@@ -126,12 +126,6 @@ &mmc0_pins_a {
}; };
&pio { &pio {
mmc0_cd_pin_colombus: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
i2c_lcd_pins: i2c_lcd_pin@0 { i2c_lcd_pins: i2c_lcd_pin@0 {
pins = "PA23", "PA24"; pins = "PA23", "PA24";
function = "gpio_out"; function = "gpio_out";
......
...@@ -215,7 +215,7 @@ &ir { ...@@ -215,7 +215,7 @@ &ir {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_hummingbird>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -241,15 +241,6 @@ &ohci0 { ...@@ -241,15 +241,6 @@ &ohci0 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
};
&p2wi { &p2wi {
status = "okay"; status = "okay";
......
...@@ -144,21 +144,13 @@ &ir { ...@@ -144,21 +144,13 @@ &ir {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_i7>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_i7: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
......
...@@ -102,7 +102,7 @@ &ir { ...@@ -102,7 +102,7 @@ &ir {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
...@@ -122,14 +122,6 @@ axp22x: pmic@68 { ...@@ -122,14 +122,6 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio {
mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
};
&reg_aldo1 { &reg_aldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -102,7 +102,7 @@ &ir { ...@@ -102,7 +102,7 @@ &ir {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
...@@ -122,14 +122,6 @@ axp22x: pmic@68 { ...@@ -122,14 +122,6 @@ axp22x: pmic@68 {
#include "axp22x.dtsi" #include "axp22x.dtsi"
&pio {
mmc0_cd_pin_m9: mmc0_cd_pin@0 {
pins = "PH22";
function = "gpio_in";
bias-pull-up;
};
};
&reg_aldo1 { &reg_aldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -146,7 +146,7 @@ button-349 { ...@@ -146,7 +146,7 @@ button-349 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -159,12 +159,6 @@ mma8452_int_primo81: mma8452_int_pin@0 { ...@@ -159,12 +159,6 @@ mma8452_int_primo81: mma8452_int_pin@0 {
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
}; };
&p2wi { &p2wi {
......
...@@ -162,7 +162,7 @@ button-349 { ...@@ -162,7 +162,7 @@ button-349 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
...@@ -173,14 +173,6 @@ &ohci1 { ...@@ -173,14 +173,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
pins = "PA4";
function = "gpio_in";
bias-pull-up;
};
};
&reg_dldo1 { &reg_dldo1 {
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
...@@ -113,7 +113,7 @@ &ir { ...@@ -113,7 +113,7 @@ &ir {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */ cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
...@@ -163,14 +163,6 @@ axp22x: pmic@68 { ...@@ -163,14 +163,6 @@ axp22x: pmic@68 {
}; };
}; };
&pio {
mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
pins = "PA4";
function = "gpio_in";
bias-pull-up;
};
};
#include "axp22x.dtsi" #include "axp22x.dtsi"
&reg_aldo1 { &reg_aldo1 {
......
...@@ -89,17 +89,9 @@ &ohci1 { ...@@ -89,17 +89,9 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 {
pins = "PA8";
function = "gpio_in";
bias-pull-up;
};
};
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......
...@@ -66,7 +66,7 @@ &ehci0 { ...@@ -66,7 +66,7 @@ &ehci0 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */ cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
...@@ -74,12 +74,6 @@ &mmc0 { ...@@ -74,12 +74,6 @@ &mmc0 {
}; };
&pio { &pio {
mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {
pins = "PA8";
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 = "PA15"; pins = "PA15";
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