aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-04-13 12:38:55 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 06:29:08 -0400
commite21e2d467ab4dd050dd02620c74be1e2665d20b9 (patch)
tree93dc9e07f50192c97412e8f5126ef1592d00a5d0 /arch
parent0aa975613320fcd8434087b6d61ef6990ec24e7d (diff)
[ARM] pxa: lubbock: move mis-placed SPI info
The SPI information got placed in the middle of the SMC91x data. Lets move it up a few lines so that we keep related things grouped together. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/lubbock.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index a9e32066a54a..ca209c443f34 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -221,26 +221,6 @@ static struct platform_device sa1111_device = {
221 .resource = sa1111_resources, 221 .resource = sa1111_resources,
222}; 222};
223 223
224static struct resource smc91x_resources[] = {
225 [0] = {
226 .name = "smc91x-regs",
227 .start = 0x0c000c00,
228 .end = 0x0c0fffff,
229 .flags = IORESOURCE_MEM,
230 },
231 [1] = {
232 .start = LUBBOCK_ETH_IRQ,
233 .end = LUBBOCK_ETH_IRQ,
234 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
235 },
236 [2] = {
237 .name = "smc91x-attrib",
238 .start = 0x0e000000,
239 .end = 0x0e0fffff,
240 .flags = IORESOURCE_MEM,
241 },
242};
243
244/* ADS7846 is connected through SSP ... and if your board has J5 populated, 224/* ADS7846 is connected through SSP ... and if your board has J5 populated,
245 * you can select it to replace the ucb1400 by switching the touchscreen cable 225 * you can select it to replace the ucb1400 by switching the touchscreen cable
246 * (to J5) and poking board registers (as done below). Else it's only useful 226 * (to J5) and poking board registers (as done below). Else it's only useful
@@ -296,6 +276,26 @@ static struct spi_board_info spi_board_info[] __initdata = { {
296}, 276},
297}; 277};
298 278
279static struct resource smc91x_resources[] = {
280 [0] = {
281 .name = "smc91x-regs",
282 .start = 0x0c000c00,
283 .end = 0x0c0fffff,
284 .flags = IORESOURCE_MEM,
285 },
286 [1] = {
287 .start = LUBBOCK_ETH_IRQ,
288 .end = LUBBOCK_ETH_IRQ,
289 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
290 },
291 [2] = {
292 .name = "smc91x-attrib",
293 .start = 0x0e000000,
294 .end = 0x0e0fffff,
295 .flags = IORESOURCE_MEM,
296 },
297};
298
299static struct platform_device smc91x_device = { 299static struct platform_device smc91x_device = {
300 .name = "smc91x", 300 .name = "smc91x",
301 .id = -1, 301 .id = -1,