aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/mach-nuri.c
diff options
context:
space:
mode:
authorJaehoon Chung <jh80.chung@samsung.com>2012-03-10 06:59:50 -0500
committerKukjin Kim <kgene.kim@samsung.com>2012-03-11 03:40:37 -0400
commitf5cca86448af2d6af67808bfbde7dc1ed170f469 (patch)
tree060ffbaa5c12c7bbc5fd37452a277c99159d580a /arch/arm/mach-exynos/mach-nuri.c
parentc1c4b66dc010bb69456f7f7c25442772bbe54dbd (diff)
ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
Thomas Arbrahams's patchset have changed the device name in sdhci-s3c.c (mmc: sdhci-s3c: Rework platform data and add device tree support) But didn't change the regulator_consumer name. So maybe didn't initialize the mmc/sd card for exynos4. This patch is fixed that (based-on linux-samsung for-next branch) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/mach-nuri.c')
-rw-r--r--arch/arm/mach-exynos/mach-nuri.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 435261f83f46..685372f38bf1 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -115,7 +115,7 @@ static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
115}; 115};
116 116
117static struct regulator_consumer_supply emmc_supplies[] = { 117static struct regulator_consumer_supply emmc_supplies[] = {
118 REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"), 118 REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"),
119 REGULATOR_SUPPLY("vmmc", "dw_mmc"), 119 REGULATOR_SUPPLY("vmmc", "dw_mmc"),
120}; 120};
121 121
@@ -413,7 +413,7 @@ static struct regulator_consumer_supply __initdata max8997_ldo12_[] = {
413 REGULATOR_SUPPLY("vddio", "6-003c"), /* HDC802 */ 413 REGULATOR_SUPPLY("vddio", "6-003c"), /* HDC802 */
414}; 414};
415static struct regulator_consumer_supply __initdata max8997_ldo13_[] = { 415static struct regulator_consumer_supply __initdata max8997_ldo13_[] = {
416 REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"), /* TFLASH */ 416 REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.2"), /* TFLASH */
417}; 417};
418static struct regulator_consumer_supply __initdata max8997_ldo14_[] = { 418static struct regulator_consumer_supply __initdata max8997_ldo14_[] = {
419 REGULATOR_SUPPLY("inmotor", "max8997-haptic"), 419 REGULATOR_SUPPLY("inmotor", "max8997-haptic"),