Skip to content

Commit

Permalink
mmc: sdhci-pci: add 8-bit bus width support for mrst hc0
Browse files Browse the repository at this point in the history
And hook platform_8bit_width to support 8-bit bus width.

Signed-off-by: Major Lee <major_lee@wistron.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Major Lee authored and Chris Ball committed Jul 20, 2011
1 parent 94dd5b3 commit 68077b0
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions drivers/mmc/host/sdhci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@ static const struct sdhci_pci_fixes sdhci_cafe = {
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
};

static int mrst_hc_probe_slot(struct sdhci_pci_slot *slot)
{
slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA;
return 0;
}

/*
* ADMA operation is disabled for Moorestown platform due to
* hardware bugs.
Expand All @@ -159,6 +165,7 @@ static int mrst_hc_probe(struct sdhci_pci_chip *chip)

static const struct sdhci_pci_fixes sdhci_intel_mrst_hc0 = {
.quirks = SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_NO_HISPD_BIT,
.probe_slot = mrst_hc_probe_slot,
};

static const struct sdhci_pci_fixes sdhci_intel_mrst_hc1_hc2 = {
Expand Down Expand Up @@ -789,8 +796,34 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host)
return 0;
}

static int sdhci_pci_8bit_width(struct sdhci_host *host, int width)
{
u8 ctrl;

ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);

switch (width) {
case MMC_BUS_WIDTH_8:
ctrl |= SDHCI_CTRL_8BITBUS;
ctrl &= ~SDHCI_CTRL_4BITBUS;
break;
case MMC_BUS_WIDTH_4:
ctrl |= SDHCI_CTRL_4BITBUS;
ctrl &= ~SDHCI_CTRL_8BITBUS;
break;
default:
ctrl &= ~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_4BITBUS);
break;
}

sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

return 0;
}

static struct sdhci_ops sdhci_pci_ops = {
.enable_dma = sdhci_pci_enable_dma,
.platform_8bit_width = sdhci_pci_8bit_width,
};

/*****************************************************************************\
Expand Down

0 comments on commit 68077b0

Please sign in to comment.