aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRom Lemarchand <rlemarchand@sta.samsung.com>2011-03-09 10:08:21 -0800
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:53:25 -0800
commit54c7ef77d05f0806c1e84fba12e6f736bb7f345d (patch)
tree58ca0f5d129989102d1996d2ce063f19512cefbd
parent0b5e071577bdb52b6a76c4e7eed35ad3d4c42752 (diff)
downloadkernel_samsung_aries-54c7ef77d05f0806c1e84fba12e6f736bb7f345d.zip
kernel_samsung_aries-54c7ef77d05f0806c1e84fba12e6f736bb7f345d.tar.gz
kernel_samsung_aries-54c7ef77d05f0806c1e84fba12e6f736bb7f345d.tar.bz2
ARM: Samsung: Add a flag to enable MMC interrupts on resume
Add an extra flag to the SD platform data to enable MMC interrupts when the host controller resumes. Change-Id: I4725e5fd8408959f0284bf9eae393e9e7a61262e Signed-off-by: Rom Lemarchand <rlemarchand@sta.samsung.com>
-rw-r--r--arch/arm/plat-samsung/dev-hsmmc.c2
-rw-r--r--arch/arm/plat-samsung/dev-hsmmc1.c2
-rw-r--r--arch/arm/plat-samsung/dev-hsmmc2.c2
-rw-r--r--arch/arm/plat-samsung/dev-hsmmc3.c2
-rw-r--r--arch/arm/plat-samsung/include/plat/sdhci.h1
5 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/dev-hsmmc.c b/arch/arm/plat-samsung/dev-hsmmc.c
index 322712c..9296bd8 100644
--- a/arch/arm/plat-samsung/dev-hsmmc.c
+++ b/arch/arm/plat-samsung/dev-hsmmc.c
@@ -80,4 +80,6 @@ void s3c_sdhci0_set_platdata(struct s3c_sdhci_platdata *pd)
set->built_in = pd->built_in;
if (pd->must_maintain_clock)
set->must_maintain_clock = pd->must_maintain_clock;
+ if (pd->enable_intr_on_resume)
+ set->enable_intr_on_resume = pd->enable_intr_on_resume;
}
diff --git a/arch/arm/plat-samsung/dev-hsmmc1.c b/arch/arm/plat-samsung/dev-hsmmc1.c
index c1a1cd7..4e7b100 100644
--- a/arch/arm/plat-samsung/dev-hsmmc1.c
+++ b/arch/arm/plat-samsung/dev-hsmmc1.c
@@ -80,4 +80,6 @@ void s3c_sdhci1_set_platdata(struct s3c_sdhci_platdata *pd)
set->built_in = pd->built_in;
if (pd->must_maintain_clock)
set->must_maintain_clock = pd->must_maintain_clock;
+ if (pd->enable_intr_on_resume)
+ set->enable_intr_on_resume = pd->enable_intr_on_resume;
}
diff --git a/arch/arm/plat-samsung/dev-hsmmc2.c b/arch/arm/plat-samsung/dev-hsmmc2.c
index c3fdb7f..ef2e8c6 100644
--- a/arch/arm/plat-samsung/dev-hsmmc2.c
+++ b/arch/arm/plat-samsung/dev-hsmmc2.c
@@ -81,4 +81,6 @@ void s3c_sdhci2_set_platdata(struct s3c_sdhci_platdata *pd)
set->built_in = pd->built_in;
if (pd->must_maintain_clock)
set->must_maintain_clock = pd->must_maintain_clock;
+ if (pd->enable_intr_on_resume)
+ set->enable_intr_on_resume = pd->enable_intr_on_resume;
}
diff --git a/arch/arm/plat-samsung/dev-hsmmc3.c b/arch/arm/plat-samsung/dev-hsmmc3.c
index 684818b..da729c5 100644
--- a/arch/arm/plat-samsung/dev-hsmmc3.c
+++ b/arch/arm/plat-samsung/dev-hsmmc3.c
@@ -84,4 +84,6 @@ void s3c_sdhci3_set_platdata(struct s3c_sdhci_platdata *pd)
set->built_in = pd->built_in;
if (pd->must_maintain_clock)
set->must_maintain_clock = pd->must_maintain_clock;
+ if (pd->enable_intr_on_resume)
+ set->enable_intr_on_resume = pd->enable_intr_on_resume;
}
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index 31e7db2..0c386fc 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -92,6 +92,7 @@ struct s3c_sdhci_platdata {
int built_in;
int must_maintain_clock;
+ int enable_intr_on_resume;
};
/**