diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2006-06-30 11:22:31 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-02 17:54:59 +0200 |
commit | df673b227ce08a7706b30fd2bf6512393d9c3c29 (patch) | |
tree | 026fb02f088a922b1a7b5c2b984e779df266625f | |
parent | [MMC] sdhci: more DMA capabilities tests (diff) | |
download | linux-df673b227ce08a7706b30fd2bf6512393d9c3c29.tar.xz linux-df673b227ce08a7706b30fd2bf6512393d9c3c29.zip |
[MMC] sdhci: support controller specific quirks
As some specific controllers will have bugs, we need a way to map special
behaviour to certain hardware.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/mmc/sdhci.c | 7 | ||||
-rw-r--r-- | drivers/mmc/sdhci.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 315ab49e4b2c..27f81e614198 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -30,6 +30,7 @@ static unsigned int debug_nodma = 0; static unsigned int debug_forcedma = 0; +static unsigned int debug_quirks = 0; static const struct pci_device_id pci_ids[] __devinitdata = { /* handle any SD host controller */ @@ -1373,6 +1374,10 @@ static int __devinit sdhci_probe(struct pci_dev *pdev, } chip->pdev = pdev; + chip->quirks = ent->driver_data; + + if (debug_quirks) + chip->quirks = debug_quirks; chip->num_slots = slots; pci_set_drvdata(pdev, chip); @@ -1453,6 +1458,7 @@ module_exit(sdhci_drv_exit); module_param(debug_nodma, uint, 0444); module_param(debug_forcedma, uint, 0444); +module_param(debug_quirks, uint, 0444); MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); @@ -1461,3 +1467,4 @@ MODULE_LICENSE("GPL"); MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)"); MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)"); +MODULE_PARM_DESC(debug_quirks, "Force certain quirks."); diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/sdhci.h index 8111fa38c05b..f2453343f783 100644 --- a/drivers/mmc/sdhci.h +++ b/drivers/mmc/sdhci.h @@ -204,6 +204,8 @@ struct sdhci_host { struct sdhci_chip { struct pci_dev *pdev; + unsigned long quirks; + int num_slots; /* Slots on controller */ struct sdhci_host *hosts[0]; /* Pointers to hosts */ }; |