Commit 9e9dc5f2 authored by Darren Salt's avatar Darren Salt Committed by Pierre Ossman
Browse files

mmc: Power quirk for ENE controllers 



Support for these devices was broken for 2.6.18-rc1 and later by commit
146ad66e, which added voltage level support.

This restores the previous behaviour for these devices by ensuring that when
the voltage is changed, only one write to set the voltage is performed.

It may be that both writes are needed if the voltage is being changed between
two non-zero values or that it's safe to ensure that only one write is done
if the hardware only supports one voltage; I don't know whether either is the
case nor can I test since I have only the one SD reader (1524:0550), and it
supports just the one voltage.

Signed-off-by: default avatarDarren Salt <linux@youmustbejoking.demon.co.uk>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 11354d03

drivers/mmc/sdhci.c

+19 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static unsigned int debug_quirks = 0; 
#define SDHCI_QUIRK_FORCE_DMA				(1<<1)

/* Controller doesn't like some resets when there is no card inserted. */

#define SDHCI_QUIRK_NO_CARD_NO_RESET			(1<<2)

#define SDHCI_QUIRK_SINGLE_POWER_WRITE			(1<<3)



static const struct pci_device_id pci_ids[] __devinitdata = {

	{
@@ -65,6 +66,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { 
		.driver_data	= SDHCI_QUIRK_FORCE_DMA,

	},



	{

		.vendor		= PCI_VENDOR_ID_ENE,

		.device		= PCI_DEVICE_ID_ENE_CB712_SD,

		.subvendor	= PCI_ANY_ID,

		.subdevice	= PCI_ANY_ID,

		.driver_data	= SDHCI_QUIRK_SINGLE_POWER_WRITE,

	},



	{	/* Generic SD host controller */

		PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00)

	},
@@ -674,10 +683,17 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) 
	if (host->power == power)

		return;



	if (power == (unsigned short)-1) {

		writeb(0, host->ioaddr + SDHCI_POWER_CONTROL);



	if (power == (unsigned short)-1)

		goto out;

	}



	/*

	 * Spec says that we should clear the power reg before setting

	 * a new value. Some controllers don't seem to like this though.

	 */

	if (!(host->chip->quirks & SDHCI_QUIRK_SINGLE_POWER_WRITE))

		writeb(0, host->ioaddr + SDHCI_POWER_CONTROL);



	pwr = SDHCI_POWER_ON;

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1971,6 +1971,7 @@ 
#define PCI_DEVICE_ID_TOPIC_TP560	0x0000



#define PCI_VENDOR_ID_ENE		0x1524

#define PCI_DEVICE_ID_ENE_CB712_SD	0x0550

#define PCI_DEVICE_ID_ENE_1211		0x1211

#define PCI_DEVICE_ID_ENE_1225		0x1225

#define PCI_DEVICE_ID_ENE_1410		0x1410

CRA Git | Maintained and supported by SUSTech CRA and CCSE