diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-08-05 06:41:20 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-08-05 06:41:20 -0400 |
commit | 908089118dd5b20c6694e9543fccd9b2490b1c6b (patch) | |
tree | 905de1edbae265c3daf62bb9b7cca908be78144a /arch/blackfin/mach-bf533 | |
parent | b9da3b9240f175a29274abb8a94d962b67bbabf6 (diff) |
Blackfin arch: remove pata resources from generic board
these are highly board specific, so putting into generic doesnt make much sense
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf533')
-rw-r--r-- | arch/blackfin/mach-bf533/boards/H8606.c | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/cm_bf533.c | 46 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/ezkit.c | 46 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/boards/stamp.c | 46 |
4 files changed, 0 insertions, 139 deletions
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index cecbc624e3df..c66a68f30239 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
40 | #endif | 40 | #endif |
41 | #include <linux/ata_platform.h> | ||
42 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
43 | 42 | ||
44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index dfccf826fa33..575843f6d9ef 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 36 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
37 | #include <linux/usb/isp1362.h> | 37 | #include <linux/usb/isp1362.h> |
38 | #endif | 38 | #endif |
39 | #include <linux/ata_platform.h> | ||
40 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
41 | #include <asm/dma.h> | 40 | #include <asm/dma.h> |
42 | #include <asm/bfin5xx_spi.h> | 41 | #include <asm/bfin5xx_spi.h> |
@@ -307,43 +306,6 @@ static struct platform_device isp1362_hcd_device = { | |||
307 | }; | 306 | }; |
308 | #endif | 307 | #endif |
309 | 308 | ||
310 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
311 | #define PATA_INT 38 | ||
312 | |||
313 | static struct pata_platform_info bfin_pata_platform_data = { | ||
314 | .ioport_shift = 2, | ||
315 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
316 | }; | ||
317 | |||
318 | static struct resource bfin_pata_resources[] = { | ||
319 | { | ||
320 | .start = 0x2030C000, | ||
321 | .end = 0x2030C01F, | ||
322 | .flags = IORESOURCE_MEM, | ||
323 | }, | ||
324 | { | ||
325 | .start = 0x2030D018, | ||
326 | .end = 0x2030D01B, | ||
327 | .flags = IORESOURCE_MEM, | ||
328 | }, | ||
329 | { | ||
330 | .start = PATA_INT, | ||
331 | .end = PATA_INT, | ||
332 | .flags = IORESOURCE_IRQ, | ||
333 | }, | ||
334 | }; | ||
335 | |||
336 | static struct platform_device bfin_pata_device = { | ||
337 | .name = "pata_platform", | ||
338 | .id = -1, | ||
339 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
340 | .resource = bfin_pata_resources, | ||
341 | .dev = { | ||
342 | .platform_data = &bfin_pata_platform_data, | ||
343 | } | ||
344 | }; | ||
345 | #endif | ||
346 | |||
347 | static const unsigned int cclk_vlev_datasheet[] = | 309 | static const unsigned int cclk_vlev_datasheet[] = |
348 | { | 310 | { |
349 | VRPAIR(VLEV_085, 250000000), | 311 | VRPAIR(VLEV_085, 250000000), |
@@ -403,10 +365,6 @@ static struct platform_device *cm_bf533_devices[] __initdata = { | |||
403 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 365 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
404 | &bfin_spi0_device, | 366 | &bfin_spi0_device, |
405 | #endif | 367 | #endif |
406 | |||
407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
408 | &bfin_pata_device, | ||
409 | #endif | ||
410 | }; | 368 | }; |
411 | 369 | ||
412 | static int __init cm_bf533_init(void) | 370 | static int __init cm_bf533_init(void) |
@@ -416,10 +374,6 @@ static int __init cm_bf533_init(void) | |||
416 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 374 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
417 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 375 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
418 | #endif | 376 | #endif |
419 | |||
420 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
421 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
422 | #endif | ||
423 | return 0; | 377 | return 0; |
424 | } | 378 | } |
425 | 379 | ||
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index 6a34f1519c07..cc2e7eeb1d5a 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 37 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
38 | #include <linux/usb/isp1362.h> | 38 | #include <linux/usb/isp1362.h> |
39 | #endif | 39 | #endif |
40 | #include <linux/ata_platform.h> | ||
41 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
42 | #include <asm/dma.h> | 41 | #include <asm/dma.h> |
43 | #include <asm/bfin5xx_spi.h> | 42 | #include <asm/bfin5xx_spi.h> |
@@ -255,43 +254,6 @@ static struct platform_device bfin_sir_device = { | |||
255 | }; | 254 | }; |
256 | #endif | 255 | #endif |
257 | 256 | ||
258 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
259 | #define PATA_INT 55 | ||
260 | |||
261 | static struct pata_platform_info bfin_pata_platform_data = { | ||
262 | .ioport_shift = 1, | ||
263 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
264 | }; | ||
265 | |||
266 | static struct resource bfin_pata_resources[] = { | ||
267 | { | ||
268 | .start = 0x20314020, | ||
269 | .end = 0x2031403F, | ||
270 | .flags = IORESOURCE_MEM, | ||
271 | }, | ||
272 | { | ||
273 | .start = 0x2031401C, | ||
274 | .end = 0x2031401F, | ||
275 | .flags = IORESOURCE_MEM, | ||
276 | }, | ||
277 | { | ||
278 | .start = PATA_INT, | ||
279 | .end = PATA_INT, | ||
280 | .flags = IORESOURCE_IRQ, | ||
281 | }, | ||
282 | }; | ||
283 | |||
284 | static struct platform_device bfin_pata_device = { | ||
285 | .name = "pata_platform", | ||
286 | .id = -1, | ||
287 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
288 | .resource = bfin_pata_resources, | ||
289 | .dev = { | ||
290 | .platform_data = &bfin_pata_platform_data, | ||
291 | } | ||
292 | }; | ||
293 | #endif | ||
294 | |||
295 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 257 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
296 | #include <linux/input.h> | 258 | #include <linux/input.h> |
297 | #include <linux/gpio_keys.h> | 259 | #include <linux/gpio_keys.h> |
@@ -404,10 +366,6 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
404 | &bfin_sir_device, | 366 | &bfin_sir_device, |
405 | #endif | 367 | #endif |
406 | 368 | ||
407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
408 | &bfin_pata_device, | ||
409 | #endif | ||
410 | |||
411 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 369 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
412 | &bfin_device_gpiokeys, | 370 | &bfin_device_gpiokeys, |
413 | #endif | 371 | #endif |
@@ -424,10 +382,6 @@ static int __init ezkit_init(void) | |||
424 | printk(KERN_INFO "%s(): registering device resources\n", __func__); | 382 | printk(KERN_INFO "%s(): registering device resources\n", __func__); |
425 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); | 383 | platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices)); |
426 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 384 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
427 | |||
428 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
429 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
430 | #endif | ||
431 | return 0; | 385 | return 0; |
432 | } | 386 | } |
433 | 387 | ||
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index d10b2dc59024..050ffca53530 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) | 38 | #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE) |
39 | #include <linux/usb/isp1362.h> | 39 | #include <linux/usb/isp1362.h> |
40 | #endif | 40 | #endif |
41 | #include <linux/ata_platform.h> | ||
42 | #include <linux/irq.h> | 41 | #include <linux/irq.h> |
43 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
@@ -404,43 +403,6 @@ static struct platform_device bfin_sport1_uart_device = { | |||
404 | }; | 403 | }; |
405 | #endif | 404 | #endif |
406 | 405 | ||
407 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
408 | #define PATA_INT 55 | ||
409 | |||
410 | static struct pata_platform_info bfin_pata_platform_data = { | ||
411 | .ioport_shift = 1, | ||
412 | .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED, | ||
413 | }; | ||
414 | |||
415 | static struct resource bfin_pata_resources[] = { | ||
416 | { | ||
417 | .start = 0x20314020, | ||
418 | .end = 0x2031403F, | ||
419 | .flags = IORESOURCE_MEM, | ||
420 | }, | ||
421 | { | ||
422 | .start = 0x2031401C, | ||
423 | .end = 0x2031401F, | ||
424 | .flags = IORESOURCE_MEM, | ||
425 | }, | ||
426 | { | ||
427 | .start = PATA_INT, | ||
428 | .end = PATA_INT, | ||
429 | .flags = IORESOURCE_IRQ, | ||
430 | }, | ||
431 | }; | ||
432 | |||
433 | static struct platform_device bfin_pata_device = { | ||
434 | .name = "pata_platform", | ||
435 | .id = -1, | ||
436 | .num_resources = ARRAY_SIZE(bfin_pata_resources), | ||
437 | .resource = bfin_pata_resources, | ||
438 | .dev = { | ||
439 | .platform_data = &bfin_pata_platform_data, | ||
440 | } | ||
441 | }; | ||
442 | #endif | ||
443 | |||
444 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 406 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
445 | #include <linux/input.h> | 407 | #include <linux/input.h> |
446 | #include <linux/gpio_keys.h> | 408 | #include <linux/gpio_keys.h> |
@@ -583,10 +545,6 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
583 | &bfin_sport1_uart_device, | 545 | &bfin_sport1_uart_device, |
584 | #endif | 546 | #endif |
585 | 547 | ||
586 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
587 | &bfin_pata_device, | ||
588 | #endif | ||
589 | |||
590 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) | 548 | #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) |
591 | &bfin_device_gpiokeys, | 549 | &bfin_device_gpiokeys, |
592 | #endif | 550 | #endif |
@@ -625,10 +583,6 @@ static int __init stamp_init(void) | |||
625 | #endif | 583 | #endif |
626 | 584 | ||
627 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); | 585 | spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); |
628 | |||
629 | #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) | ||
630 | irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; | ||
631 | #endif | ||
632 | return 0; | 586 | return 0; |
633 | } | 587 | } |
634 | 588 | ||