arm64: dts: allwinner: a64: Split out data strobe pin from mmc2 pinmux

The eMMC 5.0 standard introduced the data strobe (DS) pin. This pin is
not used for pre-5.0 data modes, nor is it found on pre-5.0 eMMC chips.
On the A64, this pin is muxed with spi0's MISO pin. If the DS pin is
included in the mmc2 pinmux by default, this wil prevent the usage
of both mmc2 and spi0 together.

Instead, split out the DS pin to a separate pinmux that only gets used
by boards that actually have it wired up. Currently supported ones
include the Bananapi M64 and Pine64 Pinebook. These are fixed up.

Fixes: a3e8f4926248 ("arm64: allwinner: a64: Add MMC pinctrl nodes")
Fixes: b8bcf0e1b212 ("arm64: allwinner: add BananaPi-M64 support")
Fixes: df35fbcfa398 ("arm64: dts: allwinner: add support for Pinebook")
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

3 files changed, 10 insertions, 3 deletions

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 094cfed13df9..e643e453ec68 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -151,7 +151,7 @@
 
 &mmc2 {
         pinctrl-names = "default";
-        pinctrl-0 = <&mmc2_pins>;
+        pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <8>;
         non-removable;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 4b8fe453bacd..73f14d7f915a 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -103,7 +103,7 @@
 
 &mmc2 {
         pinctrl-names = "default";
-        pinctrl-0 = <&mmc2_pins>;
+        pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>;
         vmmc-supply = <&reg_dcdc1>;
         vqmmc-supply = <&reg_eldo1>;
         bus-width = <8>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index b73f9287c3f0..364b7a499f7c 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -413,7 +413,7 @@
                         };
 
                         mmc2_pins: mmc2-pins {
-                                pins = "PC1", "PC5", "PC6", "PC8", "PC9",
+                                pins = "PC5", "PC6", "PC8", "PC9",
                                        "PC10","PC11", "PC12", "PC13",
                                        "PC14", "PC15", "PC16";
                                 function = "mmc2";
@@ -421,6 +421,13 @@
                                 bias-pull-up;
                         };
 
+                        mmc2_ds_pin: mmc2-ds-pin {
+                                pins = "PC1";
+                                function = "mmc2";
+                                drive-strength = <30>;
+                                bias-pull-up;
+                        };
+
                         pwm_pin: pwm_pin {
                                 pins = "PD22";
                                 function = "pwm";