aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-29 03:09:23 -0500
committerKukjin Kim <kgene.kim@samsung.com>2012-01-11 12:16:51 -0500
commitd7d3077a2843faa6877280a4fac8cc732f5e7dce (patch)
tree3ad5f90b3433e212fc500d1f27e68bdaa2c32b47 /arch/arm
parentd5b9cdbcf74c192907e8290b85c3dcb3117984fb (diff)
ARM: S3C64XX: Remove hsmmc1 from Cragganmore
The second MMC slot was only present on revision 1 of Cragganmore so remove it. Only MMC0 and MMC2 are there on production systems. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 680fd758ff2d..2e34fe861944 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -328,7 +328,6 @@ static struct platform_device wallvdd_device = {
328 328
329static struct platform_device *crag6410_devices[] __initdata = { 329static struct platform_device *crag6410_devices[] __initdata = {
330 &s3c_device_hsmmc0, 330 &s3c_device_hsmmc0,
331 &s3c_device_hsmmc1,
332 &s3c_device_hsmmc2, 331 &s3c_device_hsmmc2,
333 &s3c_device_i2c0, 332 &s3c_device_i2c0,
334 &s3c_device_i2c1, 333 &s3c_device_i2c1,
@@ -683,12 +682,6 @@ static struct s3c_sdhci_platdata crag6410_hsmmc2_pdata = {
683 .cd_type = S3C_SDHCI_CD_PERMANENT, 682 .cd_type = S3C_SDHCI_CD_PERMANENT,
684}; 683};
685 684
686static struct s3c_sdhci_platdata crag6410_hsmmc1_pdata = {
687 .max_width = 4,
688 .cd_type = S3C_SDHCI_CD_GPIO,
689 .ext_cd_gpio = S3C64XX_GPF(11),
690};
691
692static void crag6410_cfg_sdhci0(struct platform_device *dev, int width) 685static void crag6410_cfg_sdhci0(struct platform_device *dev, int width)
693{ 686{
694 /* Set all the necessary GPG pins to special-function 2 */ 687 /* Set all the necessary GPG pins to special-function 2 */
@@ -723,7 +716,6 @@ static void __init crag6410_machine_init(void)
723 gpio_direction_output(S3C64XX_GPF(10), 1); 716 gpio_direction_output(S3C64XX_GPF(10), 1);
724 717
725 s3c_sdhci0_set_platdata(&crag6410_hsmmc0_pdata); 718 s3c_sdhci0_set_platdata(&crag6410_hsmmc0_pdata);
726 s3c_sdhci1_set_platdata(&crag6410_hsmmc1_pdata);
727 s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata); 719 s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata);
728 720
729 s3c_i2c0_set_platdata(&i2c0_pdata); 721 s3c_i2c0_set_platdata(&i2c0_pdata);