| Message ID | 1469528910-12043-4-git-send-email-xzy.xu@rock-chips.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 26 July 2016 at 04:28, Ziyuan Xu <jk.kernel@gmail.com> wrote: > Boot Rom wouldn't initialize sdmmc while booting from eMMC. We need to > setup sdmmc gpio, otherwise we will hit an error below: > > =>mmc info > blk_get_device: if_type=6, devnum=0: dwmmc@ff0c0000.blk, 6, 0 > uclass_find_device_by_seq: 0 -1 > uclass_find_device_by_seq: 0 0 > - -1 -1 > - -1 0 > - found > uclass_find_device_by_seq: 0 1 > - -1 -1 > - -1 0 > - not found > fdtdec_get_int_array: interrupts > get_prop_check_min_len: interrupts > Buswidth = 1, clock: 0 > Buswidth = 1, clock: 400000 > Sending CMD0 > dwmci_send_cmd: Timeout on data busy > dwmci_send_cmd: Timeout on data busy > dwmci_send_cmd: Timeout on data busy > dwmci_send_cmd: Timeout on data busy > > This reverts commit 6efeeea79c880d3dd262e0dca9da2687f0ab68c9. > > Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com> > Acked-by: Simon Glass <sjg@chromium.org> > Tested-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: None > > arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index ed14023..1b74173 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -116,6 +116,9 @@ static void configure_l2ctlr(void) #ifdef CONFIG_SPL_MMC_SUPPORT static int configure_emmc(struct udevice *pinctrl) { +#if !defined(CONFIG_TARGET_ROCK2) && !defined(CONFIG_TARGET_FIREFLY_RK3288) && \ + !defined(CONFIG_TARGET_EVB_RK3288) + struct gpio_desc desc; int ret; @@ -145,7 +148,7 @@ static int configure_emmc(struct udevice *pinctrl) debug("gpio value ret=%d\n", ret); return ret; } - +#endif return 0; } #endif @@ -249,20 +252,17 @@ void spl_board_init(void) debug("%s: Cannot find pinctrl device\n", __func__); goto err; } + #ifdef CONFIG_SPL_MMC_SUPPORT - if (!IS_ENABLED(CONFIG_TARGET_ROCK2) && - !IS_ENABLED(CONFIG_TARGET_FIREFLY_RK3288) && - !IS_ENABLED(CONFIG_TARGET_EVB_RK3288)) { - ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD); - if (ret) { - debug("%s: Failed to set up SD card\n", __func__); - goto err; - } - ret = configure_emmc(pinctrl); - if (ret) { - debug("%s: Failed to set up eMMC\n", __func__); - goto err; - } + ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_SDCARD); + if (ret) { + debug("%s: Failed to set up SD card\n", __func__); + goto err; + } + ret = configure_emmc(pinctrl); + if (ret) { + debug("%s: Failed to set up eMMC\n", __func__); + goto err; } #endif