diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-13 19:20:12 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-13 19:20:12 -0400 |
commit | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (patch) | |
tree | 25d034a3afd0aba5f4d96531be6faf217afa9886 /arch | |
parent | 04cc7bc61c666eb090b51dc5d058b209d01d03be (diff) | |
parent | f5cca86448af2d6af67808bfbde7dc1ed170f469 (diff) |
Merge branch 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/devel-samsung-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
mmc: sdhci-s3c: add platform data for the second capability
ARM: SAMSUNG: support the second capability for samsung-soc
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/platformdata.c | 2 |
4 files changed, 7 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 = { | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | static struct regulator_consumer_supply emmc_supplies[] = { | 117 | static 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 | }; |
415 | static struct regulator_consumer_supply __initdata max8997_ldo13_[] = { | 415 | static 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 | }; |
418 | static struct regulator_consumer_supply __initdata max8997_ldo14_[] = { | 418 | static struct regulator_consumer_supply __initdata max8997_ldo14_[] = { |
419 | REGULATOR_SUPPLY("inmotor", "max8997-haptic"), | 419 | 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 = { | |||
741 | }; | 741 | }; |
742 | 742 | ||
743 | static struct regulator_consumer_supply mmc0_supplies[] = { | 743 | static struct regulator_consumer_supply mmc0_supplies[] = { |
744 | REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"), | 744 | REGULATOR_SUPPLY("vmmc", "exynos4-sdhci.0"), |
745 | }; | 745 | }; |
746 | 746 | ||
747 | static struct regulator_init_data mmc0_fixed_voltage_init_data = { | 747 | static struct regulator_init_data mmc0_fixed_voltage_init_data = { |
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index f82f888b91a9..317e246ffc56 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h | |||
@@ -40,6 +40,7 @@ enum clk_types { | |||
40 | * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI | 40 | * struct s3c_sdhci_platdata() - Platform device data for Samsung SDHCI |
41 | * @max_width: The maximum number of data bits supported. | 41 | * @max_width: The maximum number of data bits supported. |
42 | * @host_caps: Standard MMC host capabilities bit field. | 42 | * @host_caps: Standard MMC host capabilities bit field. |
43 | * @host_caps2: The second standard MMC host capabilities bit field. | ||
43 | * @cd_type: Type of Card Detection method (see cd_types enum above) | 44 | * @cd_type: Type of Card Detection method (see cd_types enum above) |
44 | * @clk_type: Type of clock divider method (see clk_types enum above) | 45 | * @clk_type: Type of clock divider method (see clk_types enum above) |
45 | * @ext_cd_init: Initialize external card detect subsystem. Called on | 46 | * @ext_cd_init: Initialize external card detect subsystem. Called on |
@@ -63,6 +64,7 @@ enum clk_types { | |||
63 | struct s3c_sdhci_platdata { | 64 | struct s3c_sdhci_platdata { |
64 | unsigned int max_width; | 65 | unsigned int max_width; |
65 | unsigned int host_caps; | 66 | unsigned int host_caps; |
67 | unsigned int host_caps2; | ||
66 | unsigned int pm_caps; | 68 | unsigned int pm_caps; |
67 | enum cd_types cd_type; | 69 | enum cd_types cd_type; |
68 | enum clk_types clk_type; | 70 | enum clk_types clk_type; |
diff --git a/arch/arm/plat-samsung/platformdata.c b/arch/arm/plat-samsung/platformdata.c index 0f707184eae0..fa78aa710ed1 100644 --- a/arch/arm/plat-samsung/platformdata.c +++ b/arch/arm/plat-samsung/platformdata.c | |||
@@ -53,6 +53,8 @@ void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd, | |||
53 | set->cfg_gpio = pd->cfg_gpio; | 53 | set->cfg_gpio = pd->cfg_gpio; |
54 | if (pd->host_caps) | 54 | if (pd->host_caps) |
55 | set->host_caps |= pd->host_caps; | 55 | set->host_caps |= pd->host_caps; |
56 | if (pd->host_caps2) | ||
57 | set->host_caps2 |= pd->host_caps2; | ||
56 | if (pd->pm_caps) | 58 | if (pd->pm_caps) |
57 | set->pm_caps |= pd->pm_caps; | 59 | set->pm_caps |= pd->pm_caps; |
58 | if (pd->clk_type) | 60 | if (pd->clk_type) |