sdhci: add quirk for the Marvell CaFe's vdd/powerup issue
PATCH 1/2 sdhci: add quirk for the Marvell CaFe's vdd/powerup issue
Hi Pierre,
Here are the reworked patches. Unfortunately, I'm traveling and don't have an SD card with me to test these out with.
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.
--- drivers/mmc/host/sdhci-pci.c | 12 ++++++++++++ drivers/mmc/host/sdhci.c | 8 ++++++++ drivers/mmc/host/sdhci.h | 2 ++ include/linux/pci_ids.h | 1 + 4 files changed, 23 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-pci.c +12 -0
@@ -104,6 +104,10 @@ static const struct sdhci_pci_fixes sdhci_ene_714 = { SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS, }; +static const struct sdhci_pci_fixes sdhci_cafe = { + .quirks =SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER , +}; +static int jmicron_pmos (struct sdhci_pci_chip *chip,int on) {u8 scratch;
@@ -299,6 +303,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { }, { + .vendor = PCI_VENDOR_ID_MARVELL, + .device = PCI_DEVICE_ID_MARVELL_CAFE_SD, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = (kernel_ulong_t)&sdhci_cafe, + }, + + { .vendor = PCI_VENDOR_ID_JMICRON, .device = PCI_DEVICE_ID_JMICRON_JMB38X_SD, .subvendor = PCI_ANY_ID,
drivers/mmc/host/sdhci.c +8 -0
@@ -658,6 +658,14 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)BUG (); } +/* +* At least the Marvell CaFe chip gets confused if we set the voltage +* and set turn on power at the same time, so set the voltage first. +*/ +if ((host->quirks &SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER )) +writeb (pwr & ~SDHCI_POWER_ON , + host->ioaddr +SDHCI_POWER_CONTROL ); +writeb (pwr, host->ioaddr +SDHCI_POWER_CONTROL ); out:
drivers/mmc/host/sdhci.h +2 -0
@@ -176,6 +176,8 @@ struct sdhci_host {#define SDHCI_QUIRK_32BIT_DMA_SIZE (1<<7)/* Controller needs to be reset after each request to stay stable */ #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) +/* Controller needs voltage and power writes to happen separately */ +#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
include/linux/pci_ids.h +1 -0
@@ -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
Signature · 1 line
1.5.5.3
Quoted 5 lines · On Fri, 27 Jun 2008 16:24:35 -0400 Andres Salomon <[email protected]> wrote:
Hi Pierre,
Here are the reworked patches. Unfortunately, I'm traveling and don't have an SD card with me to test these out with.
Both patches look fine. I've queued them up in the hopes that they are working fine, but please do a test run when you get the chance.
Rgds
Signature · 6 lines
-- Pierre Ossman WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.