|
|
|
|
@ -170,7 +170,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, |
|
|
|
|
cmd_timeout); |
|
|
|
|
} else { |
|
|
|
|
puts("timeout.\n"); |
|
|
|
|
return COMM_ERR; |
|
|
|
|
return -ECOMM; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
time++; |
|
|
|
|
@ -184,7 +184,8 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, |
|
|
|
|
flags = SDHCI_CMD_RESP_LONG; |
|
|
|
|
else if (cmd->resp_type & MMC_RSP_BUSY) { |
|
|
|
|
flags = SDHCI_CMD_RESP_SHORT_BUSY; |
|
|
|
|
mask |= SDHCI_INT_DATA_END; |
|
|
|
|
if (data) |
|
|
|
|
mask |= SDHCI_INT_DATA_END; |
|
|
|
|
} else |
|
|
|
|
flags = SDHCI_CMD_RESP_SHORT; |
|
|
|
|
|
|
|
|
|
@ -252,17 +253,17 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, |
|
|
|
|
stat = sdhci_readl(host, SDHCI_INT_STATUS); |
|
|
|
|
if (stat & SDHCI_INT_ERROR) |
|
|
|
|
break; |
|
|
|
|
} while (((stat & mask) != mask) && |
|
|
|
|
(get_timer(start) < SDHCI_READ_STATUS_TIMEOUT)); |
|
|
|
|
|
|
|
|
|
if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) { |
|
|
|
|
if (host->quirks & SDHCI_QUIRK_BROKEN_R1B) |
|
|
|
|
return 0; |
|
|
|
|
else { |
|
|
|
|
printf("%s: Timeout for status update!\n", __func__); |
|
|
|
|
return TIMEOUT; |
|
|
|
|
if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) { |
|
|
|
|
if (host->quirks & SDHCI_QUIRK_BROKEN_R1B) { |
|
|
|
|
return 0; |
|
|
|
|
} else { |
|
|
|
|
printf("%s: Timeout for status update!\n", |
|
|
|
|
__func__); |
|
|
|
|
return -ETIMEDOUT; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} while ((stat & mask) != mask); |
|
|
|
|
|
|
|
|
|
if ((stat & (SDHCI_INT_ERROR | mask)) == mask) { |
|
|
|
|
sdhci_cmd_done(host, cmd); |
|
|
|
|
@ -288,9 +289,9 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, |
|
|
|
|
sdhci_reset(host, SDHCI_RESET_CMD); |
|
|
|
|
sdhci_reset(host, SDHCI_RESET_DATA); |
|
|
|
|
if (stat & SDHCI_INT_TIMEOUT) |
|
|
|
|
return TIMEOUT; |
|
|
|
|
return -ETIMEDOUT; |
|
|
|
|
else |
|
|
|
|
return COMM_ERR; |
|
|
|
|
return -ECOMM; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) |
|
|
|
|
@ -510,18 +511,22 @@ static const struct mmc_ops sdhci_ops = { |
|
|
|
|
}; |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth, |
|
|
|
|
uint caps, u32 max_clk, u32 min_clk, uint version, |
|
|
|
|
uint quirks, uint host_caps) |
|
|
|
|
int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, |
|
|
|
|
u32 max_clk, u32 min_clk) |
|
|
|
|
{ |
|
|
|
|
cfg->name = name; |
|
|
|
|
u32 caps; |
|
|
|
|
|
|
|
|
|
caps = sdhci_readl(host, SDHCI_CAPABILITIES); |
|
|
|
|
host->version = sdhci_readw(host, SDHCI_HOST_VERSION); |
|
|
|
|
|
|
|
|
|
cfg->name = host->name; |
|
|
|
|
#ifndef CONFIG_DM_MMC_OPS |
|
|
|
|
cfg->ops = &sdhci_ops; |
|
|
|
|
#endif |
|
|
|
|
if (max_clk) |
|
|
|
|
cfg->f_max = max_clk; |
|
|
|
|
else { |
|
|
|
|
if (version >= SDHCI_SPEC_300) |
|
|
|
|
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) |
|
|
|
|
cfg->f_max = (caps & SDHCI_CLOCK_V3_BASE_MASK) >> |
|
|
|
|
SDHCI_CLOCK_BASE_SHIFT; |
|
|
|
|
else |
|
|
|
|
@ -534,7 +539,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth, |
|
|
|
|
if (min_clk) |
|
|
|
|
cfg->f_min = min_clk; |
|
|
|
|
else { |
|
|
|
|
if (version >= SDHCI_SPEC_300) |
|
|
|
|
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) |
|
|
|
|
cfg->f_min = cfg->f_max / SDHCI_MAX_DIV_SPEC_300; |
|
|
|
|
else |
|
|
|
|
cfg->f_min = cfg->f_max / SDHCI_MAX_DIV_SPEC_200; |
|
|
|
|
@ -548,16 +553,13 @@ int sdhci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth, |
|
|
|
|
cfg->voltages |= MMC_VDD_165_195; |
|
|
|
|
|
|
|
|
|
cfg->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT; |
|
|
|
|
if (version >= SDHCI_SPEC_300) { |
|
|
|
|
if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { |
|
|
|
|
if (caps & SDHCI_CAN_DO_8BIT) |
|
|
|
|
cfg->host_caps |= MMC_MODE_8BIT; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (quirks & SDHCI_QUIRK_NO_HISPD_BIT) |
|
|
|
|
cfg->host_caps &= ~(MMC_MODE_HS | MMC_MODE_HS_52MHz); |
|
|
|
|
|
|
|
|
|
if (host_caps) |
|
|
|
|
cfg->host_caps |= host_caps; |
|
|
|
|
if (host->host_caps) |
|
|
|
|
cfg->host_caps |= host->host_caps; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; |
|
|
|
|
@ -573,10 +575,10 @@ int sdhci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg) |
|
|
|
|
#else |
|
|
|
|
int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) |
|
|
|
|
{ |
|
|
|
|
#ifdef CONFIG_MMC_SDMA |
|
|
|
|
unsigned int caps; |
|
|
|
|
|
|
|
|
|
caps = sdhci_readl(host, SDHCI_CAPABILITIES); |
|
|
|
|
#ifdef CONFIG_MMC_SDMA |
|
|
|
|
if (!(caps & SDHCI_CAN_DO_SDMA)) { |
|
|
|
|
printf("%s: Your controller doesn't support SDMA!!\n", |
|
|
|
|
__func__); |
|
|
|
|
@ -584,9 +586,7 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
if (sdhci_setup_cfg(&host->cfg, host->name, host->bus_width, caps, |
|
|
|
|
max_clk, min_clk, SDHCI_GET_VERSION(host), |
|
|
|
|
host->quirks, host->host_caps)) { |
|
|
|
|
if (sdhci_setup_cfg(&host->cfg, host, max_clk, min_clk)) { |
|
|
|
|
printf("%s: Hardware doesn't specify base clock frequency\n", |
|
|
|
|
__func__); |
|
|
|
|
return -EINVAL; |
|
|
|
|
|
Tom Rini
9 years ago