sunxi: Skip MMC0 init when its pinmux conflicts with UART0

Currently, selecting UART0_PORT_F entirely disables MMC support on sunxi
platforms. But this is a bigger hammer then needed. Muxing UART0 to the
pins on port F only causes a conflict with MMC0, so minimize the impact
by specifically skipping MMC0 init. We can continue to use MMC1/2 if
those are enabled.

Let's also remove the preprocessor check while refacting this function.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 371ed9eebaf3d3504a0acadef6cf4784af4d9266..806e3bcb69467797f428642a83bcbb7b42481054 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -516,19 +516,17 @@ static void mmc_pinmux_setup(int sdc)
 
 int board_mmc_init(struct bd_info *bis)
 {
-       __maybe_unused struct mmc *mmc0, *mmc1;
-
-       mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
-       mmc0 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT);
-       if (!mmc0)
-               return -1;
+       if (!IS_ENABLED(CONFIG_UART0_PORT_F)) {
+               mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT);
+               if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT))
+                       return -1;
+       }
 
-#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
-       mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
-       mmc1 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA);
-       if (!mmc1)
-               return -1;
-#endif
+       if (CONFIG_MMC_SUNXI_SLOT_EXTRA != -1) {
+               mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA);
+               if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA))
+                       return -1;
+       }
 
        return 0;
 }