Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270271
b: refs/heads/master
c: 20758b6
h: refs/heads/master
i:
  270269: 96619ce
  270267: df39b7a
  270263: d33a08f
  270255: 4edc304
  270239: 50c8e6e
  270207: c45f7fe
v: v3
  • Loading branch information
Adrian Hunter authored and Chris Ball committed Oct 26, 2011
1 parent b4cbb1f commit bdb7c70
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b2499518b5ad7e28bb3ed348fd3f370eeb1e36c0
refs/heads/master: 20758b66dce76af0527363186f44b464d83e5666
9 changes: 9 additions & 0 deletions trunk/drivers/mmc/host/sdhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1471,6 +1471,14 @@ static int sdhci_get_ro(struct mmc_host *mmc)
return 0;
}

static void sdhci_hw_reset(struct mmc_host *mmc)
{
struct sdhci_host *host = mmc_priv(mmc);

if (host->ops && host->ops->hw_reset)
host->ops->hw_reset(host);
}

static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)
{
struct sdhci_host *host;
Expand Down Expand Up @@ -1805,6 +1813,7 @@ static const struct mmc_host_ops sdhci_ops = {
.request = sdhci_request,
.set_ios = sdhci_set_ios,
.get_ro = sdhci_get_ro,
.hw_reset = sdhci_hw_reset,
.enable_sdio_irq = sdhci_enable_sdio_irq,
.start_signal_voltage_switch = sdhci_start_signal_voltage_switch,
.execute_tuning = sdhci_execute_tuning,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mmc/host/sdhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ struct sdhci_ops {
void (*platform_reset_enter)(struct sdhci_host *host, u8 mask);
void (*platform_reset_exit)(struct sdhci_host *host, u8 mask);
int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);

void (*hw_reset)(struct sdhci_host *host);
};

#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
Expand Down

0 comments on commit bdb7c70

Please sign in to comment.