Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5cca864 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Kukjin Kim
Browse files

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: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarkyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c1c4b66d

arch/arm/mach-exynos/mach-nuri.c

+2 −2
Original line number Diff line number Diff line
@@ -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"),

arch/arm/mach-exynos/mach-universal_c210.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {