raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

sdhci: Add SD Express hook

Browse Source 
sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR speeds at 1.8v.
This commit is contained in:
Phil Elwell
2021-07-06 09:45:36 +01:00
committed by Dom Cobley
parent b8f6f37662
commit 0597dfdeba
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/host/sdhci-of-dwcmshc.c
View File

@@ -1194,7 +1194,11 @@ static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | .quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN | .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN, SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
SDHCI_QUIRK2_NO_SDR50 |
SDHCI_QUIRK2_NO_SDR104 |
SDHCI_QUIRK2_NO_SDR25,
}, },
.init = dwcmshc_rk35xx_init, .init = dwcmshc_rk35xx_init,
.postinit = dwcmshc_rk35xx_postinit, .postinit = dwcmshc_rk35xx_postinit,

19
drivers/mmc/host/sdhci.c
View File

@@ -3076,6 +3076,15 @@ static void sdhci_card_event(struct mmc_host *mmc)
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
} }
static int sdhci_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios)
{
struct sdhci_host *host = mmc_priv(mmc);
if (!host->ops->init_sd_express)
return -EOPNOTSUPP;
return host->ops->init_sd_express(host, ios);
}
static const struct mmc_host_ops sdhci_ops = { static const struct mmc_host_ops sdhci_ops = {
.request = sdhci_request, .request = sdhci_request,
.post_req = sdhci_post_req, .post_req = sdhci_post_req,
@@ -3091,6 +3100,7 @@ static const struct mmc_host_ops sdhci_ops = {
.execute_tuning = sdhci_execute_tuning, .execute_tuning = sdhci_execute_tuning,
.card_event = sdhci_card_event, .card_event = sdhci_card_event,
.card_busy = sdhci_card_busy, .card_busy = sdhci_card_busy,
.init_sd_express = sdhci_init_sd_express,
}; };
/*****************************************************************************\ /*****************************************************************************\
@@ -4618,6 +4628,15 @@ int sdhci_setup_host(struct sdhci_host *host)
!(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50)) !(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
mmc->caps |= MMC_CAP_UHS_DDR50; mmc->caps |= MMC_CAP_UHS_DDR50;
if (host->quirks2 & SDHCI_QUIRK2_NO_SDR25)
mmc->caps &= ~MMC_CAP_UHS_SDR25;
if (host->quirks2 & SDHCI_QUIRK2_NO_SDR50)
mmc->caps &= ~MMC_CAP_UHS_SDR50;
if (host->quirks2 & SDHCI_QUIRK2_NO_SDR104)
mmc->caps &= ~MMC_CAP_UHS_SDR104;
/* Does the host need tuning for SDR50? */ /* Does the host need tuning for SDR50? */
if (host->caps1 & SDHCI_USE_SDR50_TUNING) if (host->caps1 & SDHCI_USE_SDR50_TUNING)
host->flags |= SDHCI_SDR50_NEEDS_TUNING; host->flags |= SDHCI_SDR50_NEEDS_TUNING;

6
drivers/mmc/host/sdhci.h
View File

@@ -537,6 +537,11 @@ struct sdhci_host {
/* Issue CMD and DATA reset together */ /* Issue CMD and DATA reset together */
#define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER (1<<19) #define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER (1<<19)
/* Quirks to ignore a speed if a that speed is unreliable */
#define SDHCI_QUIRK2_NO_SDR25 (1<<19)
#define SDHCI_QUIRK2_NO_SDR50 (1<<20)
#define SDHCI_QUIRK2_NO_SDR104 (1<<21)
int irq; /* Device IRQ */ int irq; /* Device IRQ */
void __iomem *ioaddr; /* Mapped address */ void __iomem *ioaddr; /* Mapped address */
phys_addr_t mapbase; /* physical address base */ phys_addr_t mapbase; /* physical address base */
@@ -724,6 +729,7 @@ struct sdhci_ops {
void (*dump_vendor_regs)(struct sdhci_host *host); void (*dump_vendor_regs)(struct sdhci_host *host);
void (*dump_uhs2_regs)(struct sdhci_host *host); void (*dump_uhs2_regs)(struct sdhci_host *host);
void (*uhs2_pre_detect_init)(struct sdhci_host *host); void (*uhs2_pre_detect_init)(struct sdhci_host *host);
int (*init_sd_express)(struct sdhci_host *host, struct mmc_ios *ios);
}; };
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS