summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@bootlin.com>2018-11-21 10:44:54 +0100
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-11-28 15:14:15 +0100
commitd02932889b43524ce6515f09ea3b7df19d124074 (patch)
treee6a7ca23efc7c9a6eeb0e3c87741a0f315e1fd30
parentARM: dts: sun7i: Provide default muxing for relevant controllers (diff)
downloadlinux-d02932889b43524ce6515f09ea3b7df19d124074.tar.xz
linux-d02932889b43524ce6515f09ea3b7df19d124074.zip
ARM: dts: sun7i: 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/sun7i-a20-bananapi-m1-plus.dts5
-rw-r--r--arch/arm/boot/dts/sun7i-a20-cubietruck.dts5
-rw-r--r--arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts5
3 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
index e2e540380c6e..e2bfe0058830 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
@@ -197,11 +197,6 @@
};
};
-&mmc3_pins {
- /* AP6210 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 95da354cecb7..15c5eae4ca7b 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -215,11 +215,6 @@
};
};
-&mmc3_pins {
- /* AP6210 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 6313d8a8a37c..5f1c4f573d3e 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -167,11 +167,6 @@
};
};
-&mmc3_pins {
- /* AP6210 / AP6330 requires pull-up */
- bias-pull-up;
-};
-
&ohci0 {
status = "okay";
};