Commit df673b22 authored by Pierre Ossman's avatar Pierre Ossman Committed by Russell King

[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: default avatarPierre Ossman <drzeus@drzeus.cx>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 67435274
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
static unsigned int debug_nodma = 0; static unsigned int debug_nodma = 0;
static unsigned int debug_forcedma = 0; static unsigned int debug_forcedma = 0;
static unsigned int debug_quirks = 0;
static const struct pci_device_id pci_ids[] __devinitdata = { static const struct pci_device_id pci_ids[] __devinitdata = {
/* handle any SD host controller */ /* handle any SD host controller */
...@@ -1373,6 +1374,10 @@ static int __devinit sdhci_probe(struct pci_dev *pdev, ...@@ -1373,6 +1374,10 @@ static int __devinit sdhci_probe(struct pci_dev *pdev,
} }
chip->pdev = pdev; chip->pdev = pdev;
chip->quirks = ent->driver_data;
if (debug_quirks)
chip->quirks = debug_quirks;
chip->num_slots = slots; chip->num_slots = slots;
pci_set_drvdata(pdev, chip); pci_set_drvdata(pdev, chip);
...@@ -1453,6 +1458,7 @@ module_exit(sdhci_drv_exit); ...@@ -1453,6 +1458,7 @@ module_exit(sdhci_drv_exit);
module_param(debug_nodma, uint, 0444); module_param(debug_nodma, uint, 0444);
module_param(debug_forcedma, uint, 0444); module_param(debug_forcedma, uint, 0444);
module_param(debug_quirks, uint, 0444);
MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");
MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver");
...@@ -1461,3 +1467,4 @@ MODULE_LICENSE("GPL"); ...@@ -1461,3 +1467,4 @@ MODULE_LICENSE("GPL");
MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)"); 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_forcedma, "Forcefully enable DMA transfers. (default 0)");
MODULE_PARM_DESC(debug_quirks, "Force certain quirks.");
...@@ -204,6 +204,8 @@ struct sdhci_host { ...@@ -204,6 +204,8 @@ struct sdhci_host {
struct sdhci_chip { struct sdhci_chip {
struct pci_dev *pdev; struct pci_dev *pdev;
unsigned long quirks;
int num_slots; /* Slots on controller */ int num_slots; /* Slots on controller */
struct sdhci_host *hosts[0]; /* Pointers to hosts */ struct sdhci_host *hosts[0]; /* Pointers to hosts */
}; };
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