Skip to contentSkip to conversation

ARM: S3C64XX: Fix build of Cragganmore after SPI changes

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

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ARM: S3C64XX: Fix build of Cragganmore after SPI changes

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 <[email protected]>
---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-s3c64xx/mach-crag6410.c +1 -1
index 3600998..b77331e 100644
@@ -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));
Signature · 1 line
1.7.7.3
#1 lore raw

PATCH 1/1 ARM: S3C64XX: Fix build of Cragganmore after SPI changes

Quoted 27 lines · Mark Brown

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 <[email protected]>
---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-crag6410.c +0 -0

s3c64xx/mach-crag6410.c
index 3600998..b77331e 100644

arch/arm/mach-s3c64xx/mach-crag6410.c +1 -2
@@ -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));
 
--
Quoted 1 line

1.7.7.3

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

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

#2 lore raw

PATCH 1/1 ARM: S3C64XX: Fix build of Cragganmore after SPI changes

In reply to Mark Brown
Quoted 25 lines · Kukjin Kim
Quoted 23 lines · Mark Brown

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 <[email protected]>
---
 arch/arm/mach-s3c64xx/mach-crag6410.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-s3c64xx/mach-crag6410.c +0 -0

s3c64xx/mach-crag6410.c
index 3600998..b77331e 100644

arch/arm/mach-s3c64xx/mach-crag6410.c +1 -1
@@ -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);
Quoted 9 lines
Quoted 5 lines
arch/arm/mach-s3c64xx/mach-crag6410.c +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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

author
#3 lore raw

PATCH 1/1 ARM: S3C64XX: Fix build of Cragganmore after SPI changes

Quoted 4 lines · Kukjin Kim

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.