diff options
author | Guennadi Liakhovetski <lg@denx.de> | 2008-06-13 04:17:31 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:31:52 -0400 |
commit | e172274ccc55d20536fbdceb6131f38e288541e0 (patch) | |
tree | e3b0424d9c6d7e74608c29c91d94d94f6ab36706 /arch/arm/mach-pxa/lubbock.c | |
parent | cabb352a6455c3550f157909196845f533b0f374 (diff) |
[ARM] 5088/3: pxa2xx: add pxa2xx_set_spi_info to register pxa2xx-spi platform devices
Add a function to dynamically allocate and register pxa2xx-spi platform
devices, to be used by PXA2xx and PXA3xx based systems. Switch pcm027 and
lubbock to use it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
-rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index a3fae4139203..e041cceab16b 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -226,14 +226,6 @@ static struct pxa2xx_spi_master pxa_ssp_master_info = { | |||
226 | .num_chipselect = 0, | 226 | .num_chipselect = 0, |
227 | }; | 227 | }; |
228 | 228 | ||
229 | static struct platform_device pxa_ssp = { | ||
230 | .name = "pxa2xx-spi", | ||
231 | .id = 1, | ||
232 | .dev = { | ||
233 | .platform_data = &pxa_ssp_master_info, | ||
234 | }, | ||
235 | }; | ||
236 | |||
237 | static int lubbock_ads7846_pendown_state(void) | 229 | static int lubbock_ads7846_pendown_state(void) |
238 | { | 230 | { |
239 | /* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */ | 231 | /* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */ |
@@ -367,7 +359,6 @@ static struct platform_device *devices[] __initdata = { | |||
367 | &smc91x_device, | 359 | &smc91x_device, |
368 | &lubbock_flash_device[0], | 360 | &lubbock_flash_device[0], |
369 | &lubbock_flash_device[1], | 361 | &lubbock_flash_device[1], |
370 | &pxa_ssp, | ||
371 | }; | 362 | }; |
372 | 363 | ||
373 | static struct pxafb_mode_info sharp_lm8v31_mode = { | 364 | static struct pxafb_mode_info sharp_lm8v31_mode = { |
@@ -501,6 +492,7 @@ static void __init lubbock_init(void) | |||
501 | lubbock_flash_data[flashboot].name = "boot-rom"; | 492 | lubbock_flash_data[flashboot].name = "boot-rom"; |
502 | (void) platform_add_devices(devices, ARRAY_SIZE(devices)); | 493 | (void) platform_add_devices(devices, ARRAY_SIZE(devices)); |
503 | 494 | ||
495 | pxa2xx_set_spi_info(1, &pxa_ssp_master_info); | ||
504 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); | 496 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); |
505 | } | 497 | } |
506 | 498 | ||