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

Commit e481e45d authored Mar 21, 2011 by Richard Zhu Committed by Chris Ball Mar 25, 2011

mmc: sdhci-esdhc: remove SDHCI_QUIRK_NO_CARD_NO_RESET from esdhc



sdhci-esdhc-imx does not need SDHCI_QUIRK_NO_CARD_NO_RESET.
Make it OF-specific.

Signed-off-by: Richard Zhu <Hong-Xing.Zhu@freescale.com>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

parent b2fce6ad

drivers/mmc/host/sdhci-esdhc.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,8 +23,7 @@
	SDHCI_QUIRK_NONSTANDARD_CLOCK \| \		SDHCI_QUIRK_NONSTANDARD_CLOCK \| \
	SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK \| \		SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK \| \
	SDHCI_QUIRK_PIO_NEEDS_DELAY \| \		SDHCI_QUIRK_PIO_NEEDS_DELAY \| \
	SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET \| \		SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET)
	SDHCI_QUIRK_NO_CARD_NO_RESET)

	#define ESDHC_SYSTEM_CONTROL 0x2c		#define ESDHC_SYSTEM_CONTROL 0x2c
	#define ESDHC_CLOCK_MASK 0x0000fff0		#define ESDHC_CLOCK_MASK 0x0000fff0

drivers/mmc/host/sdhci-of-esdhc.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,8 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)

	struct sdhci_of_data sdhci_esdhc = {		struct sdhci_of_data sdhci_esdhc = {
	/* card detection could be handled via GPIO */		/* card detection could be handled via GPIO */
	.quirks = ESDHC_DEFAULT_QUIRKS \| SDHCI_QUIRK_BROKEN_CARD_DETECTION,		.quirks = ESDHC_DEFAULT_QUIRKS \| SDHCI_QUIRK_BROKEN_CARD_DETECTION
			\| SDHCI_QUIRK_NO_CARD_NO_RESET,
	.ops = {		.ops = {
	.read_l = sdhci_be32bs_readl,		.read_l = sdhci_be32bs_readl,
	.read_w = esdhc_readw,		.read_w = esdhc_readw,