diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2017-08-28 14:12:54 +0200 |
|---|---|---|
| committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2017-09-05 07:51:39 +0900 |
| commit | 8212f56347e511ad2c9f5c0fcb611d142e4fb5bb (patch) | |
| tree | 20058bc0bc5f8b17e74703317e1f66f39614f4d7 /board | |
| parent | 3158b6f606737a68a70a26bcc3484b5d64902ac0 (diff) | |
| download | u-boot-8212f56347e511ad2c9f5c0fcb611d142e4fb5bb.tar.gz | |
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/renesas/salvator-x/salvator-x.c | 9 | ||||
| -rw-r--r-- | board/renesas/ulcb/ulcb.c | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index d8a0d7a8a2..2695de5dbf 100644 --- 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 695cce9465..2b6cc612c8 100644 --- 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) { |