diff options
| author | Maxime Ripard <maxime.ripard@bootlin.com> | 2018-11-21 12:44:54 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@bootlin.com> | 2018-11-28 17:14:09 +0300 |
| commit | dea296bc62a45826629a046b6fec7f06d57989cd (patch) | |
| tree | 2cb9e0981e1aa9962655785efe25090cea070fb9 | |
| parent | d491714e8187bd5c3254971074d6c96875f0b957 (diff) | |
| download | linux-dea296bc62a45826629a046b6fec7f06d57989cd.tar.xz | |
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>
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31-colombus.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 4 |
4 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts index 21584c2f968f..f9c4169a875d 100644 --- 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 5a3b0face30e..21bceecc952d 100644 --- 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 016b23831cec..14e27e81ddf8 100644 --- 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 2d8dc4321b7b..153e40d6f4c5 100644 --- 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"; |