aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilko Krachounov <milko@3mhz.net>2007-05-18 19:18:03 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-07-09 15:23:08 -0400
commit7de064ebc67d9baf6c933d3a7046feb9b4eced05 (patch)
tree2429e9f5b7b2c0f81c18af172005cf587377e609
parent98ccf14909ba02a41c5925b0b2c92aeeef23d3b9 (diff)
sdhci: add ene controller id
ENE has a very weird design where an SDHCI device (0805) is presented on the PCI bus, but that device is non-functional, and the real device is hidden as a more generic device. Signed-off-by: Milko Krachounov <milko@3mhz.net> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/host/sdhci.c8
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a359efdd77eb..5e9a6ce83559 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -70,6 +70,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
70 .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE, 70 .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE,
71 }, 71 },
72 72
73 {
74 .vendor = PCI_VENDOR_ID_ENE,
75 .device = PCI_DEVICE_ID_ENE_CB712_SD_2,
76 .subvendor = PCI_ANY_ID,
77 .subdevice = PCI_ANY_ID,
78 .driver_data = SDHCI_QUIRK_SINGLE_POWER_WRITE,
79 },
80
73 { /* Generic SD host controller */ 81 { /* Generic SD host controller */
74 PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00) 82 PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00)
75 }, 83 },
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5b1c9994f89a..75c4d4d06892 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2000,6 +2000,7 @@
2000 2000
2001#define PCI_VENDOR_ID_ENE 0x1524 2001#define PCI_VENDOR_ID_ENE 0x1524
2002#define PCI_DEVICE_ID_ENE_CB712_SD 0x0550 2002#define PCI_DEVICE_ID_ENE_CB712_SD 0x0550
2003#define PCI_DEVICE_ID_ENE_CB712_SD_2 0x0551
2003#define PCI_DEVICE_ID_ENE_1211 0x1211 2004#define PCI_DEVICE_ID_ENE_1211 0x1211
2004#define PCI_DEVICE_ID_ENE_1225 0x1225 2005#define PCI_DEVICE_ID_ENE_1225 0x1225
2005#define PCI_DEVICE_ID_ENE_1410 0x1410 2006#define PCI_DEVICE_ID_ENE_1410 0x1410