mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
mmc: dw_mmc: move supports-highspeed of quirks to caps
'supports-highspeed' is not one of the quirks but is a capability. So, it's removed from quirks. Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com> Tested-by: Alim Akhtar <alim.akhtar@samsung.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
5dd63f5246
commit
10b498419f
1 changed files with 3 additions and 6 deletions
|
@ -1999,9 +1999,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
|
||||||
mmc->caps |= MMC_CAP_4_BIT_DATA;
|
mmc->caps |= MMC_CAP_4_BIT_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (host->pdata->quirks & DW_MCI_QUIRK_HIGHSPEED)
|
|
||||||
mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
|
|
||||||
|
|
||||||
if (host->pdata->blk_settings) {
|
if (host->pdata->blk_settings) {
|
||||||
mmc->max_segs = host->pdata->blk_settings->max_segs;
|
mmc->max_segs = host->pdata->blk_settings->max_segs;
|
||||||
mmc->max_blk_size = host->pdata->blk_settings->max_blk_size;
|
mmc->max_blk_size = host->pdata->blk_settings->max_blk_size;
|
||||||
|
@ -2130,9 +2127,6 @@ static struct dw_mci_of_quirks {
|
||||||
int id;
|
int id;
|
||||||
} of_quirks[] = {
|
} of_quirks[] = {
|
||||||
{
|
{
|
||||||
.quirk = "supports-highspeed",
|
|
||||||
.id = DW_MCI_QUIRK_HIGHSPEED,
|
|
||||||
}, {
|
|
||||||
.quirk = "broken-cd",
|
.quirk = "broken-cd",
|
||||||
.id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
|
.id = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
|
||||||
},
|
},
|
||||||
|
@ -2187,6 +2181,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
|
||||||
if (of_find_property(np, "enable-sdio-wakeup", NULL))
|
if (of_find_property(np, "enable-sdio-wakeup", NULL))
|
||||||
pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
|
pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
|
||||||
|
|
||||||
|
if (of_find_property(np, "supports-highspeed", NULL))
|
||||||
|
pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
|
||||||
|
|
||||||
if (of_find_property(np, "caps2-mmc-hs200-1_8v", NULL))
|
if (of_find_property(np, "caps2-mmc-hs200-1_8v", NULL))
|
||||||
pdata->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
|
pdata->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue