public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore
@ 2011-12-28 12:26 Mark Brown
  2011-12-28 12:32 ` Mark Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-12-28 12:26 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    8 --------
 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 1edd7b7a..3600998 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 = {
 
 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);
-- 
1.7.7.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore
  2011-12-28 12:26 [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore Mark Brown
@ 2011-12-28 12:32 ` Mark Brown
  2011-12-28 13:07   ` Mark Brown
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-12-28 12:32 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Dec 28, 2011 at 12:26:19PM +0000, Mark Brown wrote:
> 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore
  2011-12-28 12:32 ` Mark Brown
@ 2011-12-28 13:07   ` Mark Brown
  2011-12-29  3:35     ` Kukjin Kim
  0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-12-28 13:07 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Dec 28, 2011 at 12:32:53PM +0000, Mark Brown wrote:
> On Wed, Dec 28, 2011 at 12:26:19PM +0000, Mark Brown wrote:
> > 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.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore
  2011-12-28 13:07   ` Mark Brown
@ 2011-12-29  3:35     ` Kukjin Kim
  0 siblings, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2011-12-29  3:35 UTC (permalink / raw)
  To: linux-arm-kernel

Mark Brown wrote:
> 
> On Wed, Dec 28, 2011 at 12:32:53PM +0000, Mark Brown wrote:
> > On Wed, Dec 28, 2011 at 12:26:19PM +0000, Mark Brown wrote:
> > > 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 <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-12-29  3:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-28 12:26 [PATCH] ARM: S3C64XX: Remove hsmmc1 from Cragganmore Mark Brown
2011-12-28 12:32 ` Mark Brown
2011-12-28 13:07   ` Mark Brown
2011-12-29  3:35     ` Kukjin Kim

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox