From: Pierre Ossman As some specific controllers will have bugs, we need a way to map special behaviour to certain hardware. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton --- drivers/mmc/sdhci.c | 7 +++++++ drivers/mmc/sdhci.h | 2 ++ 2 files changed, 9 insertions(+) diff -puN drivers/mmc/sdhci.c~mmc-support-controller-specific-quirks drivers/mmc/sdhci.c --- 25/drivers/mmc/sdhci.c~mmc-support-controller-specific-quirks Tue Jun 27 14:28:51 2006 +++ 25-akpm/drivers/mmc/sdhci.c Tue Jun 27 14:28:51 2006 @@ -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 } 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 "); 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 -puN drivers/mmc/sdhci.h~mmc-support-controller-specific-quirks drivers/mmc/sdhci.h --- 25/drivers/mmc/sdhci.h~mmc-support-controller-specific-quirks Tue Jun 27 14:28:51 2006 +++ 25-akpm/drivers/mmc/sdhci.h Tue Jun 27 14:28:51 2006 @@ -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 */ }; _