aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mmc/sdhci.c7
-rw-r--r--drivers/mmc/sdhci.h2
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 @@
30 30
31static unsigned int debug_nodma = 0; 31static unsigned int debug_nodma = 0;
32static unsigned int debug_forcedma = 0; 32static unsigned int debug_forcedma = 0;
33static unsigned int debug_quirks = 0;
33 34
34static const struct pci_device_id pci_ids[] __devinitdata = { 35static const struct pci_device_id pci_ids[] __devinitdata = {
35 /* handle any SD host controller */ 36 /* handle any SD host controller */
@@ -1373,6 +1374,10 @@ static int __devinit sdhci_probe(struct pci_dev *pdev,
1373 } 1374 }
1374 1375
1375 chip->pdev = pdev; 1376 chip->pdev = pdev;
1377 chip->quirks = ent->driver_data;
1378
1379 if (debug_quirks)
1380 chip->quirks = debug_quirks;
1376 1381
1377 chip->num_slots = slots; 1382 chip->num_slots = slots;
1378 pci_set_drvdata(pdev, chip); 1383 pci_set_drvdata(pdev, chip);
@@ -1453,6 +1458,7 @@ module_exit(sdhci_drv_exit);
1453 1458
1454module_param(debug_nodma, uint, 0444); 1459module_param(debug_nodma, uint, 0444);
1455module_param(debug_forcedma, uint, 0444); 1460module_param(debug_forcedma, uint, 0444);
1461module_param(debug_quirks, uint, 0444);
1456 1462
1457MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); 1463MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>");
1458MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver"); 1464MODULE_DESCRIPTION("Secure Digital Host Controller Interface driver");
@@ -1461,3 +1467,4 @@ MODULE_LICENSE("GPL");
1461 1467
1462MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)"); 1468MODULE_PARM_DESC(debug_nodma, "Forcefully disable DMA transfers. (default 0)");
1463MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)"); 1469MODULE_PARM_DESC(debug_forcedma, "Forcefully enable DMA transfers. (default 0)");
1470MODULE_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 {
204struct sdhci_chip { 204struct sdhci_chip {
205 struct pci_dev *pdev; 205 struct pci_dev *pdev;
206 206
207 unsigned long quirks;
208
207 int num_slots; /* Slots on controller */ 209 int num_slots; /* Slots on controller */
208 struct sdhci_host *hosts[0]; /* Pointers to hosts */ 210 struct sdhci_host *hosts[0]; /* Pointers to hosts */
209}; 211};