aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorRom Lemarchand <rlemarchand@sta.samsung.com>2011-03-09 10:04:46 -0800
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:53:25 -0800
commit01a17777a844d3957ffe8be240a88d39a7157ea0 (patch)
tree5293005add4646bc62f072e50f88cb641b822859 /drivers/mmc
parent54c7ef77d05f0806c1e84fba12e6f736bb7f345d (diff)
downloadkernel_samsung_aries-01a17777a844d3957ffe8be240a88d39a7157ea0.zip
kernel_samsung_aries-01a17777a844d3957ffe8be240a88d39a7157ea0.tar.gz
kernel_samsung_aries-01a17777a844d3957ffe8be240a88d39a7157ea0.tar.bz2
MMC:S3C: Turn interrupts on on resume when flag is set
When the appropriate flag is set, turn SD controller interrupts on on resume. Change-Id: Icba8b2e9a209d1c39aadbc3cf361e85d2424ab5d Signed-off-by: Rom Lemarchand <rlemarchand@sta.samsung.com>
Diffstat (limited to 'drivers/mmc')
-rwxr-xr-xdrivers/mmc/host/sdhci-s3c.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index e50a1644..fb3eba6 100755
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -686,8 +686,18 @@ static int sdhci_s3c_suspend(struct platform_device *dev, pm_message_t pm)
static int sdhci_s3c_resume(struct platform_device *dev)
{
struct sdhci_host *host = platform_get_drvdata(dev);
+ struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
+ u32 ier;
sdhci_resume_host(host);
+
+ if (pdata->enable_intr_on_resume) {
+ ier = sdhci_readl(host, SDHCI_INT_ENABLE);
+ ier |= SDHCI_INT_CARD_INT;
+ sdhci_writel(host, ier, SDHCI_INT_ENABLE);
+ sdhci_writel(host, ier, SDHCI_SIGNAL_ENABLE);
+ }
+
return 0;
}