ARM: dts: sun6i: Remove redundant MMC pinmux tuning

Some boards override the MMC pin muxing settings in order to enable the
pull-ups and change the drive strength to a value higher than the default.

While this was needed in the earlier days, this is now the default setting
for those pins, and therefore we don't need those board-specific settings
anymore.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 21584c2f968f4734337715ae454cfb74c660ced7..f9c4169a875daa77104e7ae1cfb53a677a34f869 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -121,10 +121,6 @@
        status = "okay";
 };
 
-&mmc0_pins_a {
-       bias-pull-up;
-};
-
 &pio {
        i2c_lcd_pins: i2c_lcd_pin@0 {
                pins = "PA23", "PA24";

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 5a3b0face30e6d40fc8b40ac56ae9a9204d5d3ab..21bceecc952d1b27402dc356967e9cc52fdf5631 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -222,11 +222,6 @@
        status = "okay";
 };
 
-&mmc0_pins_a {
-       /* external pull-ups missing for some pins */
-       bias-pull-up;
-};
-
 &mmc1 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins_a>;

diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index 016b23831cec5a289f19e31d2212b6728821ee2d..14e27e81ddf8c7c35638a21bd27bf9315230c2a0 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -120,10 +120,6 @@
        status = "okay";
 };
 
-&mmc0_pins_a {
-       bias-pull-up;
-};
-
 &mmc2 {
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins_a>;
@@ -142,10 +138,6 @@
        };
 };
 
-&mmc2_pins_a {
-       bias-pull-up;
-};
-
 &ohci0 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index 2d8dc4321b7b9ae58fe6d6274f8fb6b7afddcd86..153e40d6f4c591feaf212deb6ec844b9b240f924 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -98,10 +98,6 @@
        status = "okay";
 };
 
-&mmc0_pins_a {
-       bias-pull-up;
-};
-
 &p2wi {
        status = "okay";