diff options
| author | Jaehoon Chung <[email protected]> | 2012-03-10 03:59:50 -0800 |
|---|---|---|
| committer | Kukjin Kim <[email protected]> | 2012-03-10 23:40:37 -0800 |
| commit | f5cca86448af2d6af67808bfbde7dc1ed170f469 (patch) | |
| tree | 060ffbaa5c12c7bbc5fd37452a277c99159d580a | |
| parent | c1c4b66dc010bb69456f7f7c25442772bbe54dbd (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 <[email protected]>
Signed-off-by: kyungmin Park <[email protected]>
Reviewed-by: Thomas Abraham <[email protected]>
Signed-off-by: Kukjin Kim <[email protected]>
| -rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 |
2 files changed, 3 insertions, 3 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 = { }; static struct regulator_consumer_supply emmc_supplies[] = { - REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"), + REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"), REGULATOR_SUPPLY("vmmc", "dw_mmc"), }; @@ -413,7 +413,7 @@ static struct regulator_consumer_supply __initdata max8997_ldo12_[] = { REGULATOR_SUPPLY("vddio", "6-003c"), /* HDC802 */ }; static struct regulator_consumer_supply __initdata max8997_ldo13_[] = { - REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"), /* TFLASH */ + REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.2"), /* TFLASH */ }; static struct regulator_consumer_supply __initdata max8997_ldo14_[] = { REGULATOR_SUPPLY("inmotor", "max8997-haptic"), diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 0fc65ffde8ff..f0dcca47fede 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -741,7 +741,7 @@ static struct s3c_sdhci_platdata universal_hsmmc0_data __initdata = { }; static struct regulator_consumer_supply mmc0_supplies[] = { - REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"), + REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"), }; static struct regulator_init_data mmc0_fixed_voltage_init_data = { |