libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3405 from bigmagic123/fix_raspi_sdio 

fix raspi3-32 sdio driver
This commit is contained in:
Bernard Xiong 2020-02-25 09:26:09 +08:00 committed by GitHub
parent 2c41f4f1c8 f3b9a9bdfa
commit f35a6745de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bsp/raspberry-pi/raspi3-32/driver/drv_sdio.c
View File

@ -99,8 +99,9 @@ rt_err_t sd_int(struct sdhci_pdata_t * pdat, unsigned int mask)
if (cnt <= 0 || (r & INT_CMD_TIMEOUT) || (r & INT_DATA_TIMEOUT))
{
write32(pdat->virt + EMMC_INTERRUPT, r);
rt_kprintf("send cmd/data timeout wait for %x int: %x, status: %x\n",mask, r, read32(pdat->virt + EMMC_STATUS));
return -RT_ETIMEOUT;
//qemu maybe can not use sdcard
//rt_kprintf("send cmd/data timeout wait for %x int: %x, status: %x\n",mask, r, read32(pdat->virt + EMMC_STATUS));
//return -RT_ETIMEOUT;
}
else if (r & INT_ERROR_MASK)
{
@ -122,7 +123,9 @@ rt_err_t sd_status(struct sdhci_pdata_t * pdat, unsigned int mask)
return -RT_ETIMEOUT;
}
else if (read32(pdat->virt + EMMC_INTERRUPT) & INT_ERROR_MASK)
{
return -RT_ERROR;
}
return RT_EOK;
}
@ -252,8 +255,15 @@ static rt_err_t raspi_transfer_data(struct sdhci_pdata_t * pdat, struct sdhci_cm
ret = raspi_transfer_command(pdat, &newcmd);
if (ret) return ret;
}
write32(pdat->virt + EMMC_BLKSIZECNT, dlen | 1 << 16);
if(dlen < 512)
{
write32(pdat->virt + EMMC_BLKSIZECNT, dlen | 1 << 16);
}
else
{
write32(pdat->virt + EMMC_BLKSIZECNT, 512 | (dat->blkcnt) << 16);
}
if (dat->flag & DATA_DIR_READ)
{
cmd->datarw = DATA_READ;