ARM: S3C64XX: Remove hsmmc1 from Cragganmore

PATCH New Mark Brown 2 participants 4 messages Dec 28, 2011 – Dec 29, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Mark Brown

author

2011-12-28 12:26 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

arch/arm/mach-s3c64xx/mach-crag6410.c +0 -8

index 1edd7b7a..3600998 100644
@@ -328,7 +328,6 @@ static struct platform_device wallvdd_device = {
 
 static struct platform_device *crag6410_devices[] __initdata = {
 	&s3c_device_hsmmc0,
-	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
 	&s3c_device_i2c0,
 	&s3c_device_i2c1,

@@ -693,12 +692,6 @@ static struct s3c_sdhci_platdata crag6410_hsmmc2_pdata = {
 	.cd_type		= S3C_SDHCI_CD_PERMANENT,
 };
 
-static struct s3c_sdhci_platdata crag6410_hsmmc1_pdata = {
-	.max_width		= 4,
-	.cd_type		= S3C_SDHCI_CD_GPIO,
-	.ext_cd_gpio		= S3C64XX_GPF(11),
-};
-
 static void crag6410_cfg_sdhci0(struct platform_device *dev, int width)
 {
 	/* Set all the necessary GPG pins to special-function 2 */

@@ -733,7 +726,6 @@ static void __init crag6410_machine_init(void)
 	gpio_direction_output(S3C64XX_GPF(10), 1);
 
 	s3c_sdhci0_set_platdata(&crag6410_hsmmc0_pdata);
-	s3c_sdhci1_set_platdata(&crag6410_hsmmc1_pdata);
 	s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata);
 
 	s3c_i2c0_set_platdata(&i2c0_pdata);

Signature · 1 line

1.7.7.3

Mark Brown

author

2011-12-28 12:32 UTC #1 lore raw

PATCH 1/1 ARM: S3C64XX: Remove hsmmc1 from Cragganmore

Quoted 2 lines · Mark Brown

The second MMC slot was only present on revision 1 of Cragganmore so remove it. Only MMC0 and MMC2 are there on production systems.

Sorry, ignore this - wrong slot.

Mark Brown

author

2011-12-28 13:07 UTC #2 lore raw

PATCH 1/1 ARM: S3C64XX: Remove hsmmc1 from Cragganmore

Quoted 5 lines · Mark Brown

Quoted 2 lines · Mark Brown
The second MMC slot was only present on revision 1 of Cragganmore so remove it. Only MMC0 and MMC2 are there on production systems.
Sorry, ignore this - wrong slot.

Gah! Actually I was right first time and got confused by some other bugs as I rebased onto -next.

Kukjin Kim

2011-12-29 03:35 UTC #3 lore raw

PATCH 1/1 ARM: S3C64XX: Remove hsmmc1 from Cragganmore

Quoted 10 lines · Mark Brown

Quoted 5 lines · Mark Brown
Quoted 2 lines · Mark Brown
The second MMC slot was only present on revision 1 of Cragganmore so remove it. Only MMC0 and MMC2 are there on production systems.
Sorry, ignore this - wrong slot.
Gah! Actually I was right first time and got confused by some other bugs as I rebased onto -next.

Hahah, Mark, you need some refresh?

Anyway, looks ok to me, will apply.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.