From bdb7c70fd4ddedfa399f036d78b2b948ad20f718 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@intel.com>
Date: Mon, 29 Aug 2011 16:42:12 +0300
Subject: [PATCH] --- yaml --- r: 270271 b: refs/heads/master c:
 20758b66dce76af0527363186f44b464d83e5666 h: refs/heads/master i:   270269:
 96619ce43e06939e138e8b77e25a7218f62d9a94   270267:
 df39b7abc0d08cc8f5a9e61177e4924a37be71ab   270263:
 d33a08f066226a344393616d236d9fcd9632616a   270255:
 4edc30440021d30b4bc351082b4d8f783a74bc21   270239:
 50c8e6e5c80d96cef3f4b4862824710ef4169a9c   270207:
 c45f7fec5b6a9ba17762a8e01ec6380ed66b1837 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mmc/host/sdhci.c | 9 +++++++++
 trunk/drivers/mmc/host/sdhci.h | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7435406d3a9a..a19b2c76852f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2499518b5ad7e28bb3ed348fd3f370eeb1e36c0
+refs/heads/master: 20758b66dce76af0527363186f44b464d83e5666
diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c
index 0e02cc1df12e..d66a7a11a4fc 100644
--- a/trunk/drivers/mmc/host/sdhci.c
+++ b/trunk/drivers/mmc/host/sdhci.c
@@ -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;
@@ -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,
diff --git a/trunk/drivers/mmc/host/sdhci.h b/trunk/drivers/mmc/host/sdhci.h
index 745c42fa41ed..7bd919c33cc2 100644
--- a/trunk/drivers/mmc/host/sdhci.h
+++ b/trunk/drivers/mmc/host/sdhci.h
@@ -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