Re: [U-Boot] [PATCH 10/16] Blackfin: Bf60x: Check card ready for each RSI command

2012-08-20 Thread Bob Liu 
On Wed, Aug 8, 2012 at 1:05 PM, Mike Frysinger vap...@gentoo.org wrote:
 On Tuesday 07 August 2012 04:07:49 Bob Liu wrote:
 Set up RSI data before sending RSI command if data is applicable.

 squash into the Blackfin: rsi: add bf60x support patch
 -mike

Okay.

-- 
Regards,
--Bob
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 10/16] Blackfin: Bf60x: Check card ready for each RSI command

2012-08-07 Thread Bob Liu 
From: Sonic Zhang sonic.zh...@analog.com

Set up RSI data before sending RSI command if data is applicable.

Signed-off-by: Sonic Zhang sonic.zh...@analog.com
Signed-off-by: Bob Liu lliu...@gmail.com
---
 drivers/mmc/bfin_sdh.c |   23 ---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/bfin_sdh.c b/drivers/mmc/bfin_sdh.c
index 4dd9b78..f22429a 100644
--- a/drivers/mmc/bfin_sdh.c
+++ b/drivers/mmc/bfin_sdh.c
@@ -79,6 +79,9 @@ sdh_send_cmd(struct mmc *mmc, struct mmc_cmd *mmc_cmd)
sdh_cmd |= CMD_RSP;
if (flags  MMC_RSP_136)
sdh_cmd |= CMD_L_RSP;
+#ifdef RSI_BLKSZ
+   sdh_cmd |= CMD_DATA0_BUSY;
+#endif
 
bfin_write_SDH_ARGUMENT(arg);
bfin_write_SDH_COMMAND(sdh_cmd);
@@ -113,6 +116,12 @@ sdh_send_cmd(struct mmc *mmc, struct mmc_cmd *mmc_cmd)
 
bfin_write_SDH_STATUS_CLR(CMD_SENT_STAT | CMD_RESP_END_STAT |
CMD_TIMEOUT_STAT | CMD_CRC_FAIL_STAT);
+#ifdef RSI_BLKSZ
+   /* wait till card ready */
+   while (!(bfin_read_RSI_ESTAT()  SD_CARD_READY))
+   ;
+   bfin_write_RSI_ESTAT(SD_CARD_READY);
+#endif
 
return ret;
 }
@@ -122,7 +131,6 @@ static int sdh_setup_data(struct mmc *mmc, struct mmc_data 
*data)
 {
u16 data_ctl = 0;
u16 dma_cfg = 0;
-   int ret = 0;
unsigned long data_size = data-blocksize * data-blocks;
 
/* Don't support write yet. */
@@ -150,7 +158,7 @@ static int sdh_setup_data(struct mmc *mmc, struct mmc_data 
*data)
/* kick off transfer */
bfin_write_SDH_DATA_CTL(bfin_read_SDH_DATA_CTL() | DTX_DMA_E | DTX_E);
 
-   return ret;
+   return 0;
 }
 
 
@@ -160,15 +168,23 @@ static int bfin_sdh_request(struct mmc *mmc, struct 
mmc_cmd *cmd,
u32 status;
int ret = 0;
 
+   if (data) {
+   ret = sdh_setup_data(mmc, data);
+   if (ret)
+   return ret;
+   }
+
ret = sdh_send_cmd(mmc, cmd);
if (ret) {
bfin_write_SDH_COMMAND(0);
+   bfin_write_DMA_CONFIG(0);
+   bfin_write_SDH_DATA_CTL(0);
SSYNC();
printf(sending CMD%d failed\n, cmd-cmdidx);
return ret;
}
+
if (data) {
-   ret = sdh_setup_data(mmc, data);
do {
udelay(1);
status = bfin_read_SDH_STATUS();
@@ -253,6 +269,7 @@ static int bfin_sdh_init(struct mmc *mmc)
bfin_write_SDH_PWR_CTL(PWR_ON | ROD_CTL);
 #else
bfin_write_SDH_CFG(bfin_read_SDH_CFG() | PWR_ON);
+#endif
return 0;
 }
 
-- 
1.7.9.5


___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH 10/16] Blackfin: Bf60x: Check card ready for each RSI command

2012-08-07 Thread Mike Frysinger 
On Tuesday 07 August 2012 04:07:49 Bob Liu wrote:
 Set up RSI data before sending RSI command if data is applicable.

squash into the Blackfin: rsi: add bf60x support patch
-mike


signature.asc
Description: This is a digitally signed message part.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot