Skip to content

L
linux-davinci
Commit cc25fbc0 authored by Matt Fleming's avatar Matt Fleming Committed by James Toy
Browse files
Options

Some hosts can accept only certain types of cards. For example, an eMMC 

is MMC only and a uSD slot may be SD only.  However the MMC card scanning
logic checks for all card types one by one.

Add host capabilities to specify which card types can be used, and amend
the card scanning logic to skip scanning for those types which cannot be
used.
Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Acked-by: default avatarMatt Fleming <matt@console-pimps.org>
Cc: Ian Molton <ian@mnementh.co.uk>
Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Cc: Denis Karpov <ext-denis.2.karpov@nokia.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: Philip Langdale <philipl@overt.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 999c646f
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 17 deletions
drivers/mmc/core/core.c
View file @ cc25fbc0
......@@ -1075,7 +1075,11 @@ void mmc_rescan(struct work_struct *work)
mmc_power_up(host);
mmc_go_idle(host);
mmc_send_if_cond(host, host->ocr_avail);
if ((host->caps & MMC_CAP_SDIO) || (host->caps & MMC_CAP_SD))
mmc_send_if_cond(host, host->ocr_avail);
if (!(host->caps & MMC_CAP_SDIO))
goto not_sdio;
/*
* First we search for SDIO...
......@@ -1087,6 +1091,10 @@ void mmc_rescan(struct work_struct *work)
goto out;
}
not_sdio:
if (!(host->caps & MMC_CAP_SD))
goto not_sd;
/*
* ...then normal SD...
*/
......@@ -1097,6 +1105,10 @@ void mmc_rescan(struct work_struct *work)
goto out;
}
not_sd:
if (!(host->caps & MMC_CAP_MMC))
goto not_mmc;
/*
* ...and finally MMC.
*/
......@@ -1107,6 +1119,8 @@ void mmc_rescan(struct work_struct *work)
goto out;
}
not_mmc:
mmc_release_host(host);
mmc_power_off(host);
......
drivers/mmc/host/at91_mci.c
View file @ cc25fbc0
......@@ -1007,7 +1007,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
mmc->f_min = 375000;
mmc->f_max = 25000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_SDIO_IRQ;
mmc->caps = MMC_CAP_SDIO_IRQ | MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
mmc->max_blk_size = 4095;
mmc->max_blk_count = mmc->max_req_size;
......
drivers/mmc/host/atmel-mci.c
View file @ cc25fbc0
......@@ -1467,6 +1467,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
mmc->f_min = DIV_ROUND_UP(host->bus_hz, 512);
mmc->f_max = host->bus_hz / 2;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
if (slot_data->bus_width >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA;
......
drivers/mmc/host/au1xmmc.c
View file @ cc25fbc0
......@@ -1003,7 +1003,8 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
mmc->max_blk_count = 512;
mmc->ocr_avail = AU1XMMC_OCR;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ |
MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
host->status = HOST_S_IDLE;
......
drivers/mmc/host/cb710-mmc.c
View file @ cc25fbc0
......@@ -721,7 +721,8 @@ static int __devinit cb710_mmc_init(struct platform_device *pdev)
mmc->f_max = val;
mmc->f_min = val >> cb710_clock_divider_log2[CB710_MAX_DIVIDER_IDX];
mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
reader = mmc_priv(mmc);
......
drivers/mmc/host/imxmmc.c
View file @ cc25fbc0
......@@ -962,7 +962,8 @@ static int __init imxmci_probe(struct platform_device *pdev)
mmc->f_min = 150000;
mmc->f_max = CLK_RATE/2;
mmc->ocr_avail = MMC_VDD_32_33;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
/* MMC core transfer sizes tunable parameters */
mmc->max_hw_segs = 64;
......
drivers/mmc/host/mmc_spi.c
View file @ cc25fbc0
......@@ -1386,7 +1386,7 @@ static int mmc_spi_probe(struct spi_device *spi)
mmc->max_req_size = MMC_SPI_BLOCKSATONCE * MMC_SPI_BLOCKSIZE;
mmc->max_blk_count = MMC_SPI_BLOCKSATONCE;
mmc->caps = MMC_CAP_SPI;
mmc->caps = MMC_CAP_SPI | MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
/* SPI doesn't need the lowspeed device identification thing for
* MMC or SD cards, since it never comes up in open drain mode.
......
drivers/mmc/host/mmci.c
View file @ cc25fbc0
......@@ -585,6 +585,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
mmc->f_max = min(host->mclk, fmax);
mmc->ocr_avail = plat->ocr_mask;
mmc->caps = MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
/*
* We can do SGIO
*/
......
drivers/mmc/host/mvsdio.c
View file @ cc25fbc0
......@@ -734,7 +734,8 @@ static int __init mvsd_probe(struct platform_device *pdev)
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ |
MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
mmc->f_min = DIV_ROUND_UP(host->base_clock, MVSD_BASE_DIV_MAX);
mmc->f_max = maxfreq;
......
drivers/mmc/host/mxcmmc.c
View file @ cc25fbc0
......@@ -700,7 +700,8 @@ static int mxcmci_probe(struct platform_device *pdev)
}
mmc->ops = &mxcmci_ops;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MMC |
MMC_CAP_SD | MMC_CAP_SDIO;
/* MMC core transfer sizes tunable parameters */
mmc->max_hw_segs = 64;
......
drivers/mmc/host/omap.c
View file @ cc25fbc0
......@@ -1314,7 +1314,7 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id)
host->slots[id] = slot;
mmc->caps = 0;
mmc->caps = MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
if (host->pdata->slots[id].wires >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA;
......
drivers/mmc/host/omap_hsmmc.c
View file @ cc25fbc0
......@@ -1087,6 +1087,8 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
else if (pdata->slots[host->slot_id].wires >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA;
mmc->caps |= MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
omap_hsmmc_init(host);
/* Select DMA lines */
......
drivers/mmc/host/pxamci.c
View file @ cc25fbc0
......@@ -613,7 +613,7 @@ static int pxamci_probe(struct platform_device *pdev)
pxamci_init_ocr(host);
mmc->caps = 0;
mmc->caps = MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
host->cmdat = 0;
if (!cpu_is_pxa25x()) {
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
......
drivers/mmc/host/s3cmci.c
View file @ cc25fbc0
......@@ -1376,7 +1376,8 @@ static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
mmc->ops = &s3cmci_ops;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
mmc->f_min = host->clk_rate / (host->clk_div * 256);
mmc->f_max = host->clk_rate / host->clk_div;
......
drivers/mmc/host/sdhci.c
View file @ cc25fbc0
......@@ -1777,7 +1777,7 @@ int sdhci_add_host(struct sdhci_host *host)
else
mmc->f_min = host->max_clk / 256;
mmc->f_max = host->max_clk;
mmc->caps = MMC_CAP_SDIO_IRQ;
mmc->caps = MMC_CAP_SDIO_IRQ | MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
mmc->caps |= MMC_CAP_4_BIT_DATA;
......
drivers/mmc/host/sdricoh_cs.c
View file @ cc25fbc0
......@@ -443,7 +443,8 @@ static int sdricoh_init_mmc(struct pci_dev *pci_dev,
mmc->f_min = 450000;
mmc->f_max = 24000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps |= MMC_CAP_4_BIT_DATA;
mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
mmc->max_seg_size = 1024 * 512;
mmc->max_blk_size = 512;
......
drivers/mmc/host/tifm_sd.c
View file @ cc25fbc0
......@@ -973,7 +973,8 @@ static int tifm_sd_probe(struct tifm_dev *sock)
mmc->ops = &tifm_sd_ops;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
mmc->f_min = 20000000 / 60;
mmc->f_max = 24000000;
......
drivers/mmc/host/tmio_mmc.c
View file @ cc25fbc0
......@@ -564,7 +564,8 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
}
mmc->ops = &tmio_mmc_ops;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
mmc->f_max = pdata->hclk;
mmc->f_min = mmc->f_max / 512;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
......
drivers/mmc/host/via-sdmmc.c
View file @ cc25fbc0
......@@ -1046,7 +1046,8 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host)
mmc->f_min = VIA_CRDR_MIN_CLOCK;
mmc->f_max = VIA_CRDR_MAX_CLOCK;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SD_HIGHSPEED |
MMC_CAP_SDIO | MMC_CAP_SD | MMC_CAP_MMC;
mmc->ops = &via_sdc_ops;
/*Hardware cannot do scatter lists*/
......
drivers/mmc/host/wbsd.c
View file @ cc25fbc0
......@@ -1219,7 +1219,8 @@ static int __devinit wbsd_alloc_mmc(struct device *dev)
mmc->f_min = 375000;
mmc->f_max = 24000000;
mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
mmc->caps = MMC_CAP_4_BIT_DATA;
mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO |
MMC_CAP_SD | MMC_CAP_MMC;
spin_lock_init(&host->lock);
......
include/linux/mmc/host.h
View file @ cc25fbc0
......@@ -150,6 +150,9 @@ struct mmc_host {
#define MMC_CAP_DISABLE (1 << 7) /* Can the host be disabled */
#define MMC_CAP_NONREMOVABLE (1 << 8) /* Nonremovable e.g. eMMC */
#define MMC_CAP_WAIT_WHILE_BUSY (1 << 9) /* Waits while card is busy */
#define MMC_CAP_SDIO (1 << 10) /* Card can be SDIO */
#define MMC_CAP_SD (1 << 11) /* Card can be SD */
#define MMC_CAP_MMC (1 << 12) /* Card can be MMC */
/* host specific block data */
unsigned int max_seg_size; /* see blk_queue_max_segment_size */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment