linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes
@ 2011-12-28 12:05 Mark Brown
  2011-12-29  3:36 ` Kukjin Kim
  2011-12-30  2:00 ` Kukjin Kim
  0 siblings, 2 replies; 4+ messages in thread
From: Mark Brown @ 2011-12-28 12:05 UTC (permalink / raw)
  To: linux-arm-kernel

Commit 875a59 (ARM: SAMSUNG: Consolidation of SPI platform devices to
plat-samsung) replaced the function s3c64xx_spi_set_info() with
s3c64xx_spiN_set_platdata() but did not update all the machines, with
Cragganmore being left. Fix that.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 3600998..b77331e 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -736,7 +736,7 @@ static void __init crag6410_machine_init(void)
 	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
 
 	samsung_keypad_set_platdata(&crag6410_keypad_data);
-        s3c64xx_spi_set_info(0, 0, 1);
+	s3c64xx_spi0_set_platdata(NULL, 0, 1);
 
 	platform_add_devices(crag6410_devices, ARRAY_SIZE(crag6410_devices));
 
-- 
1.7.7.3

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

* [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes
  2011-12-28 12:05 [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes Mark Brown
@ 2011-12-29  3:36 ` Kukjin Kim
  2011-12-30  2:00 ` Kukjin Kim
  1 sibling, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2011-12-29  3:36 UTC (permalink / raw)
  To: linux-arm-kernel

Mark Brown wrote:
> 
> Commit 875a59 (ARM: SAMSUNG: Consolidation of SPI platform devices to
> plat-samsung) replaced the function s3c64xx_spi_set_info() with
> s3c64xx_spiN_set_platdata() but did not update all the machines, with
> Cragganmore being left. Fix that.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-
> s3c64xx/mach-crag6410.c
> index 3600998..b77331e 100644
> --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> @@ -736,7 +736,7 @@ static void __init crag6410_machine_init(void)
>  	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
> 
>  	samsung_keypad_set_platdata(&crag6410_keypad_data);
> -        s3c64xx_spi_set_info(0, 0, 1);
> +	s3c64xx_spi0_set_platdata(NULL, 0, 1);
> 
>  	platform_add_devices(crag6410_devices,
> ARRAY_SIZE(crag6410_devices));
> 
> --
> 1.7.7.3

Yeah, some machines can be missed to update.
Thanks, will apply.

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

* [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes
  2011-12-28 12:05 [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes Mark Brown
  2011-12-29  3:36 ` Kukjin Kim
@ 2011-12-30  2:00 ` Kukjin Kim
  2011-12-30  2:02   ` Mark Brown
  1 sibling, 1 reply; 4+ messages in thread
From: Kukjin Kim @ 2011-12-30  2:00 UTC (permalink / raw)
  To: linux-arm-kernel

Kukjin Kim wrote:
> 
> Mark Brown wrote:
> >
> > Commit 875a59 (ARM: SAMSUNG: Consolidation of SPI platform devices to
> > plat-samsung) replaced the function s3c64xx_spi_set_info() with
> > s3c64xx_spiN_set_platdata() but did not update all the machines, with
> > Cragganmore being left. Fix that.
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > ---
> >  arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-
> > s3c64xx/mach-crag6410.c
> > index 3600998..b77331e 100644
> > --- a/arch/arm/mach-s3c64xx/mach-crag6410.c
> > +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
> > @@ -736,7 +736,7 @@ static void __init crag6410_machine_init(void)
> >  	i2c_register_board_info(1, i2c_devs1, ARRAY_SIZE(i2c_devs1));
> >
> >  	samsung_keypad_set_platdata(&crag6410_keypad_data);
> > -        s3c64xx_spi_set_info(0, 0, 1);
> > +	s3c64xx_spi0_set_platdata(NULL, 0, 1);
> >
> >  	platform_add_devices(crag6410_devices,
> > ARRAY_SIZE(crag6410_devices));
> >
> > --
> > 1.7.7.3
> 
> Yeah, some machines can be missed to update.
> Thanks, will apply.
> 
Hi Mark,

I couldn't look at the line of 's3c64xx_spi_set_info(...);' which is deleted
in this patch in my tree. So I couldn't apply this.

Do you want to apply this just to add 's3c64xx_spi0_set_platdata()'?

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

* [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes
  2011-12-30  2:00 ` Kukjin Kim
@ 2011-12-30  2:02   ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-12-30  2:02 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Dec 30, 2011 at 11:00:05AM +0900, Kukjin Kim wrote:

> I couldn't look at the line of 's3c64xx_spi_set_info(...);' which is deleted
> in this patch in my tree. So I couldn't apply this.

> Do you want to apply this just to add 's3c64xx_spi0_set_platdata()'?

No, I think this is a case of me noticing a problem in a patch I thought
was already upstream (and pushed later in the day).  Sorry for the
noise.

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

end of thread, other threads:[~2011-12-30  2:02 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:05 [PATCH] ARM: S3C64XX: Fix build of Cragganmore after SPI changes Mark Brown
2011-12-29  3:36 ` Kukjin Kim
2011-12-30  2:00 ` Kukjin Kim
2011-12-30  2:02   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).