| Message ID | 1468894407-26770-1-git-send-email-xzy.xu@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 5051a77b2dc2c8dc1f7454ed900b94d228ad4bd5 |
| Delegated to: | Simon Glass |
| Headers | show |
On 18 July 2016 at 20:13, Ziyuan Xu <xzy.xu@rock-chips.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> > --- > > arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) Acked-by: Simon Glass <sjg@chromium.org> Tested on firefly-rk3288: Tested-by: Simon Glass <sjg@chromium.org> I think this is safe to apply now that we have reduced SPL size. - Simon
Hi Simon, On 2016年07月23日 10:57, Simon Glass wrote: > On 18 July 2016 at 20:13, Ziyuan Xu <xzy.xu@rock-chips.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> >> --- >> >> arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++-------------- >> 1 file changed, 14 insertions(+), 14 deletions(-) > Acked-by: Simon Glass <sjg@chromium.org> > Tested on firefly-rk3288: > Tested-by: Simon Glass <sjg@chromium.org> > > I think this is safe to apply now that we have reduced SPL size. Did you mean that commit 97feca3325bb2065a7ef7d30e1f308b74f1fb33c(rockchip: Use of-platdata for firefly-rk3288)? If you recommend that use of-platfdata instead of of-libfd, I will revise it on evb-rk32288 & fennect-rk3288 board. > > - Simon > > >
Hi Ziyuan, On 22 July 2016 at 21:45, Ziyuan Xu <xzy.xu@rock-chips.com> wrote: > Hi Simon, > > > On 2016年07月23日 10:57, Simon Glass wrote: >> >> On 18 July 2016 at 20:13, Ziyuan Xu <xzy.xu@rock-chips.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> >>> --- >>> >>> arch/arm/mach-rockchip/rk3288-board-spl.c | 28 >>> ++++++++++++++-------------- >>> 1 file changed, 14 insertions(+), 14 deletions(-) >> >> Acked-by: Simon Glass <sjg@chromium.org> >> Tested on firefly-rk3288: >> Tested-by: Simon Glass <sjg@chromium.org> >> >> I think this is safe to apply now that we have reduced SPL size. > > Did you mean that commit 97feca3325bb2065a7ef7d30e1f308b74f1fb33c(rockchip: > Use of-platdata for firefly-rk3288)? > If you recommend that use of-platfdata instead of of-libfd, I will revise it > on evb-rk32288 & fennect-rk3288 board. Only if you have space problems on that board (with SPL being too large). If not, then don't bother. The of-platdata code is more painful to work with. Regards, Simon
Hi Simon, On 2016年07月25日 10:07, Simon Glass wrote: > Hi Ziyuan, > > On 22 July 2016 at 21:45, Ziyuan Xu <xzy.xu@rock-chips.com> wrote: >> Hi Simon, >> >> >> On 2016年07月23日 10:57, Simon Glass wrote: >>> On 18 July 2016 at 20:13, Ziyuan Xu <xzy.xu@rock-chips.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> >>>> --- >>>> >>>> arch/arm/mach-rockchip/rk3288-board-spl.c | 28 >>>> ++++++++++++++-------------- >>>> 1 file changed, 14 insertions(+), 14 deletions(-) >>> Acked-by: Simon Glass <sjg@chromium.org> >>> Tested on firefly-rk3288: >>> Tested-by: Simon Glass <sjg@chromium.org> >>> >>> I think this is safe to apply now that we have reduced SPL size. >> Did you mean that commit 97feca3325bb2065a7ef7d30e1f308b74f1fb33c(rockchip: >> Use of-platdata for firefly-rk3288)? >> If you recommend that use of-platfdata instead of of-libfd, I will revise it >> on evb-rk32288 & fennect-rk3288 board. > Only if you have space problems on that board (with SPL being too > large). If not, then don't bother. The of-platdata code is more > painful to work with. Okay, I get it. The of-libfd is more smart than of-platdata. > > Regards, > Simon > > >
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
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> --- arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)