GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-15 11:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: starfive: fix mmc device power-up sequence

Browse source 
fix mmc device power-up sequence.

Signed-off-by: William Qiu <william.qiu@starfivetech.com>
This commit is contained in:
William Qiu 2023-07-17 14:45:18 +08:00
parent 8bc74ce3e1
commit f9516d9db1
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmc/dw_mmc.c
View file

@ -21,6 +21,19 @@
#define PAGE_SIZE 4096
static inline int __test_and_clear_bit_1(int nr, void *addr)
{
int mask, retval;
unsigned int *a = (unsigned int *)addr;
a += nr >> 5;
mask = 1 << (nr & 0x1f);
retval = (mask & *a) != 0;
*a &= ~mask;
return retval;
}
static int dwmci_wait_reset(struct dwmci_host *host, u32 value)
{
unsigned long timeout = 1000;
@ -317,6 +330,9 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
if (cmd->resp_type & MMC_RSP_CRC)
flags |= DWMCI_CMD_CHECK_CRC;
if (__test_and_clear_bit_1(DW_MMC_CARD_NEED_INIT, &host->flags))
flags |= DWMCI_CMD_SEND_INIT;
flags |= (cmd->cmdidx | DWMCI_CMD_START | DWMCI_CMD_USE_HOLD_REG);
debug("Sending CMD%d\n",cmd->cmdidx);
@ -594,6 +610,8 @@ static int dwmci_init(struct mmc *mmc)
return -EIO;
}
host->flags = 1 << DW_MMC_CARD_NEED_INIT;
/* Enumerate at 400KHz */
dwmci_setup_bus(host, mmc->cfg->f_min);

9
include/dwmmc.h
View file

@ -92,6 +92,7 @@
#define DWMCI_CMD_RW (1 << 10)
#define DWMCI_CMD_SEND_STOP (1 << 12)
#define DWMCI_CMD_ABORT_STOP (1 << 14)
#define DWMCI_CMD_SEND_INIT (1 << 15)
#define DWMCI_CMD_PRV_DAT_WAIT (1 << 13)
#define DWMCI_CMD_UPD_CLK (1 << 21)
#define DWMCI_CMD_USE_HOLD_REG (1 << 29)
@ -198,6 +199,14 @@ struct dwmci_host {
/* use fifo mode to read and write data */
bool fifo_mode;
/* Starfive: porting from kernel 5.15, fix mmc device power-up sequence */
unsigned int flags;
#define DW_MMC_CARD_PRESENT 0
#define DW_MMC_CARD_NEED_INIT 1
#define DW_MMC_CARD_NO_LOW_PWR 2
#define DW_MMC_CARD_NO_USE_HOLD 3
#define DW_MMC_CARD_NEEDS_POLL 4
};
struct dwmci_idmac {