Commit 86a6a874 authored by Pierre Ossman's avatar Pierre Ossman
Browse files

Revert "sdhci: force high speed capability on some controllers" 



This reverts commit a4b76193.

It turned out that the controller had problem running at the
higher speed, so go back to trusting the hardware capability
bits.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 444122fd

drivers/mmc/host/sdhci-pci.c

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ static int jmicron_probe(struct sdhci_pci_chip *chip) 
			  SDHCI_QUIRK_32BIT_DMA_SIZE |

			  SDHCI_QUIRK_32BIT_ADMA_SIZE |

			  SDHCI_QUIRK_RESET_AFTER_REQUEST |

			  SDHCI_QUIRK_BROKEN_SMALL_PIO |

			  SDHCI_QUIRK_FORCE_HIGHSPEED;

			  SDHCI_QUIRK_BROKEN_SMALL_PIO;

	}



	/*

drivers/mmc/host/sdhci.c

+1 −2
Original line number Diff line number Diff line
@@ -1636,8 +1636,7 @@ int sdhci_add_host(struct sdhci_host *host) 
	mmc->f_max = host->max_clk;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;



	if ((caps & SDHCI_CAN_DO_HISPD) ||

		(host->quirks & SDHCI_QUIRK_FORCE_HIGHSPEED))

	if (caps & SDHCI_CAN_DO_HISPD)

		mmc->caps |= MMC_CAP_SD_HIGHSPEED;



	mmc->ocr_avail = 0;

drivers/mmc/host/sdhci.h

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ struct sdhci_host { 
#define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL			(1<<12)

/* Controller has an issue with buffer bits for small transfers */

#define SDHCI_QUIRK_BROKEN_SMALL_PIO			(1<<13)

/* Controller supports high speed but doesn't have the caps bit set */

#define SDHCI_QUIRK_FORCE_HIGHSPEED			(1<<14)



	int			irq;		/* Device IRQ */

	void __iomem *		ioaddr;		/* Mapped address */