summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2008-07-04 10:00:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-04 10:40:09 -0700
commite08c1694d9e2138204f2b79b73f0f159074ce2f5 (patch)
tree78078c43810ab607516445c9543220f26306eecf /include
parent491539982aa01fa71de93c2a06ac5d890d4cf1e2 (diff)
downloadop-kernel-dev-e08c1694d9e2138204f2b79b73f0f159074ce2f5.zip
op-kernel-dev-e08c1694d9e2138204f2b79b73f0f159074ce2f5.tar.gz
olpc: sdhci: add quirk for the Marvell CaFe's vdd/powerup issue
This has been sitting around unloved for way too long.. The Marvell CaFe chip's SD implementation chokes during card insertion if one attempts to set the voltage and power up in the same SDHCI_POWER_CONTROL register write. This adds a quirk that does that particular dance in two steps. It also adds an entry to pci_ids.h for the CaFe chip's SD device. Signed-off-by: Andres Salomon <dilinger@debian.org> Cc: Pierre Ossman <drzeus-list@drzeus.cx> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci_ids.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index eafc9d6..6595382 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1520,6 +1520,7 @@
#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
+#define PCI_DEVICE_ID_MARVELL_CAFE_SD 0x4101
#define PCI_VENDOR_ID_V3 0x11b0
#define PCI_DEVICE_ID_V3_V960 0x0001
OpenPOWER on IntegriCloud