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/pcm027.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/pcm027.c')
-rw-r--r-- | arch/arm/mach-pxa/pcm027.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index 3b945eb0aee3..377f3be8ce57 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c | |||
@@ -24,7 +24,9 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/mtd/physmap.h> | 25 | #include <linux/mtd/physmap.h> |
26 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
27 | #include <linux/spi/max7301.h> | ||
27 | #include <linux/leds.h> | 28 | #include <linux/leds.h> |
29 | |||
28 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
29 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
30 | #include <asm/arch/hardware.h> | 32 | #include <asm/arch/hardware.h> |
@@ -108,6 +110,32 @@ static struct platform_device smc91x_device = { | |||
108 | .resource = smc91x_resources, | 110 | .resource = smc91x_resources, |
109 | }; | 111 | }; |
110 | 112 | ||
113 | /* | ||
114 | * SPI host and devices | ||
115 | */ | ||
116 | static struct pxa2xx_spi_master pxa_ssp_master_info = { | ||
117 | .num_chipselect = 1, | ||
118 | }; | ||
119 | |||
120 | static struct max7301_platform_data max7301_info = { | ||
121 | .base = -1, | ||
122 | }; | ||
123 | |||
124 | /* bus_num must match id in pxa2xx_set_spi_info() call */ | ||
125 | static struct spi_board_info spi_board_info[] __initdata = { | ||
126 | { | ||
127 | .modalias = "max7301", | ||
128 | .platform_data = &max7301_info, | ||
129 | .max_speed_hz = 13000000, | ||
130 | .bus_num = 1, | ||
131 | .chip_select = 0, | ||
132 | .mode = SPI_MODE_0, | ||
133 | }, | ||
134 | }; | ||
135 | |||
136 | /* | ||
137 | * NOR flash | ||
138 | */ | ||
111 | static struct physmap_flash_data pcm027_flash_data = { | 139 | static struct physmap_flash_data pcm027_flash_data = { |
112 | .width = 4, | 140 | .width = 4, |
113 | }; | 141 | }; |
@@ -190,6 +218,9 @@ static void __init pcm027_init(void) | |||
190 | #ifdef CONFIG_MACH_PCM990_BASEBOARD | 218 | #ifdef CONFIG_MACH_PCM990_BASEBOARD |
191 | pcm990_baseboard_init(); | 219 | pcm990_baseboard_init(); |
192 | #endif | 220 | #endif |
221 | |||
222 | pxa2xx_set_spi_info(1, &pxa_ssp_master_info); | ||
223 | spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); | ||
193 | } | 224 | } |
194 | 225 | ||
195 | static void __init pcm027_map_io(void) | 226 | static void __init pcm027_map_io(void) |