Revert "rockchip: Move the MMC setup check earlier"

PATCH New Ziyuan Xu 2 participants 5 messages Jul 19, 2016 – Jul 25, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Rockchip

lore

Share & tools

lore

Ziyuan Xu

author

2016-07-19 02:13 UTC #0 lore raw

PATCH 1/1 Revert "rockchip: Move the MMC setup check earlier"

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 at 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 <[email protected]>

---

 arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

arch/arm/mach-rockchip/rk3288-board-spl.c +14 ~~-14~~

index ed14023..1b74173 100644
@@ -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

Signature · 1 line

1.9.1

Simon Glass

2016-07-23 02:57 UTC #1 lore raw

PATCH 1/1 Revert "rockchip: Move the MMC setup check earlier"

Quoted 24 lines · Ziyuan Xu

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 at 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

Quoted 7 lines

This reverts commit 6efeeea79c880d3dd262e0dca9da2687f0ab68c9.
Signed-off-by Ziyuan Xu <[email protected]>
---
 arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Acked-by Simon Glass <[email protected]>

Tested on firefly-rk3288:

Tested-by Simon Glass <[email protected]>

I think this is safe to apply now that we have reduced SPL size.

- Simon

Ziyuan Xu

author

2016-07-23 03:45 UTC #2 lore raw

PATCH 1/1 Revert "rockchip: Move the MMC setup check earlier"

Hi Simon,

Quoted 30 lines · Simon Glass

Quoted 29 lines · Ziyuan Xu
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 at 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 <[email protected]>
---

Quoted 7 lines

Quoted 2 lines
  arch/arm/mach-rockchip/rk3288-board-spl.c | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
Acked-by Simon Glass <[email protected]>
Tested on firefly-rk3288:
Tested-by Simon Glass <[email protected]>
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.

Quoted 5 lines

- Simon

Simon Glass

2016-07-25 02:07 UTC #3 lore raw

PATCH 1/1 Revert "rockchip: Move the MMC setup check earlier"

Hi Ziyuan,

Quoted 44 lines · Ziyuan Xu

Hi Simon,
Quoted 40 lines · Simon Glass
Quoted 25 lines · Ziyuan Xu
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 at 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
Quoted 8 lines
This reverts commit 6efeeea79c880d3dd262e0dca9da2687f0ab68c9.
Signed-off-by Ziyuan Xu <[email protected]>
---
  arch/arm/mach-rockchip/rk3288-board-spl.c | 28
++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
Acked-by Simon Glass <[email protected]>
Tested on firefly-rk3288:
Tested-by Simon Glass <[email protected]>

Quoted 6 lines

Quoted 1 line
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

Ziyuan Xu

author

2016-07-25 02:20 UTC #4 lore raw

PATCH 1/1 Revert "rockchip: Move the MMC setup check earlier"

Hi Simon,

Quoted 44 lines · Simon Glass

Hi Ziyuan,
Quoted 41 lines · Ziyuan Xu
Hi Simon,
Quoted 37 lines · Simon Glass
Quoted 24 lines · Ziyuan Xu
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 at 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
Quoted 8 lines
This reverts commit 6efeeea79c880d3dd262e0dca9da2687f0ab68c9.
Signed-off-by Ziyuan Xu <[email protected]>
---
   arch/arm/mach-rockchip/rk3288-board-spl.c | 28
++++++++++++++--------------
   1 file changed, 14 insertions(+), 14 deletions(-)
Acked-by Simon Glass <[email protected]>
Tested on firefly-rk3288:
Tested-by Simon Glass <[email protected]>

Quoted 8 lines

Quoted 5 lines
Quoted 1 line
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.

Quoted 6 lines

Regards,
Simon