Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08c1694 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

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: default avatarAndres Salomon <dilinger@debian.org>
Cc: Pierre Ossman <drzeus-list@drzeus.cx>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49153998

drivers/mmc/host/sdhci.c

+18 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static unsigned int debug_quirks = 0; 
#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)



static const struct pci_device_id pci_ids[] __devinitdata = {

	{
@@ -127,6 +129,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { 
				  SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS,

	},



	{

		.vendor         = PCI_VENDOR_ID_MARVELL,

		.device         = PCI_DEVICE_ID_MARVELL_CAFE_SD,

		.subvendor      = PCI_ANY_ID,

		.subdevice      = PCI_ANY_ID,

		.driver_data    = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER,

	},



	{

		.vendor         = PCI_VENDOR_ID_JMICRON,

		.device         = PCI_DEVICE_ID_JMICRON_JMB38X_SD,
@@ -774,6 +784,14 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) 
		BUG();

	}



	/*

	 * At least the 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->chip->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:

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -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