Commit 4ead0ad7 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun8i: a23/a33: 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 9c2d3d17
...@@ -104,21 +104,13 @@ button-600 { ...@@ -104,21 +104,13 @@ button-600 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_evb: mmc0_cd_pin@0 {
pins = "PB4";
function = "gpio_in";
bias-pull-up;
};
};
/* /*
* The RX line has a non-populated resistance. In order to use it, you * The RX line has a non-populated resistance. In order to use it, you
* need to solder R207 on the back of the board in order to close the * need to solder R207 on the back of the board in order to close the
......
...@@ -141,7 +141,7 @@ button-600 { ...@@ -141,7 +141,7 @@ button-600 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
...@@ -167,14 +167,6 @@ &ohci0 { ...@@ -167,14 +167,6 @@ &ohci0 {
status = "okay"; status = "okay";
}; };
&pio {
mmc0_cd_pin_sina33: mmc0_cd_pin@0 {
pins = "PB4";
function = "gpio_in";
bias-pull-up;
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
......
...@@ -127,7 +127,7 @@ button-390 { ...@@ -127,7 +127,7 @@ button-390 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */ cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>; bus-width = <4>;
...@@ -163,12 +163,6 @@ &ohci0 { ...@@ -163,12 +163,6 @@ &ohci0 {
}; };
&pio { &pio {
mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
pins = "PD14";
function = "gpio_in";
bias-pull-up;
};
usb0_id_det: usb0_id_detect_pin@0 { usb0_id_det: usb0_id_detect_pin@0 {
pins = "PD10"; pins = "PD10";
function = "gpio_in"; function = "gpio_in";
......
...@@ -81,7 +81,7 @@ touchscreen: touchscreen@40 { ...@@ -81,7 +81,7 @@ touchscreen: touchscreen@40 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; pinctrl-0 = <&mmc0_pins_a>;
vmmc-supply = <&reg_dcdc1>; vmmc-supply = <&reg_dcdc1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */ cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
...@@ -89,12 +89,6 @@ &mmc0 { ...@@ -89,12 +89,6 @@ &mmc0 {
}; };
&pio { &pio {
mmc0_cd_pin: mmc0_cd_pin@0 {
pins = "PB4";
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 = "PH8"; pins = "PH8";
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