ARM: rmobile: Drop board_mmc_init

The board_mmc_init() is no longer invoked when DM is used, so move
all the pinmux config into board_init() instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index d8a0d7a8a2e702d6b2c62171f456fdaa93946ed1..2695de5dbf358633c189c2aee38326574665c130 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -158,12 +158,7 @@ int board_init(void)
        udelay(1);
 #endif
 
-       return 0;
-}
-
-#ifdef CONFIG_SH_SDHI
-int board_mmc_init(bd_t *bis)
-{
+#ifdef CONFIG_MMC
        /* SDHI0 */
        gpio_request(GPIO_GFN_SD0_DAT0, NULL);
        gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@@ -227,10 +222,10 @@ int board_mmc_init(bd_t *bis)
        gpio_request(GPIO_GP_3_14, NULL);
        gpio_direction_output(GPIO_GP_3_15, 1); /* power on */
        gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */
+#endif
 
        return 0;
 }
-#endif
 
 int dram_init(void)
 {

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 695cce9465a650cbdb3b4de8dd94c59b040880ec..2b6cc612c8c597ff143147425301e952c47768f0 100644 (file)
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -137,12 +137,7 @@ int board_init(void)
        udelay(1);
 #endif
 
-       return 0;
-}
-
-#ifdef CONFIG_SH_SDHI
-int board_mmc_init(bd_t *bis)
-{
+#ifdef CONFIG_MMC
        /* SDHI0 */
        gpio_request(GPIO_GFN_SD0_DAT0, NULL);
        gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@@ -179,10 +174,10 @@ int board_mmc_init(bd_t *bis)
        gpio_request(GPIO_GP_5_9, NULL);
        gpio_direction_output(GPIO_GP_5_3, 0);  /* 1: 3.3V, 0: 1.8V */
        gpio_direction_output(GPIO_GP_5_9, 0);  /* 1: 3.3V, 0: 1.8V */
+#endif
 
        return 0;
 }
-#endif
 
 int dram_init(void)
 {