aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2009-04-21 08:05:50 -0400
committerMike Frysinger <vapier@gentoo.org>2009-06-12 06:03:46 -0400
commit648882d940a1f84cbf11418ae6e405ef42a66855 (patch)
treef9cce8859d18bc171afe23f2cf7819e6ab4bdaa3 /arch/blackfin
parent51387009bd4d9fdbc9d4a91e45bd96cc8e3065de (diff)
Blackfin: fix up PATA resource handling in bf537-stamp
Make sure the addresses declared match reality, and make the PATA IRQ code optional. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 0572926da23f..9bd0a809641b 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -1358,16 +1358,18 @@ static struct resource bfin_pata_resources[] = {
1358static struct pata_platform_info bfin_pata_platform_data = { 1358static struct pata_platform_info bfin_pata_platform_data = {
1359 .ioport_shift = 0, 1359 .ioport_shift = 0,
1360}; 1360};
1361 1361/* CompactFlash Storage Card Memory Mapped Adressing
1362 * /REG = A11 = 1
1363 */
1362static struct resource bfin_pata_resources[] = { 1364static struct resource bfin_pata_resources[] = {
1363 { 1365 {
1364 .start = 0x20211820, 1366 .start = 0x20211800,
1365 .end = 0x2021183F, 1367 .end = 0x20211807,
1366 .flags = IORESOURCE_MEM, 1368 .flags = IORESOURCE_MEM,
1367 }, 1369 },
1368 { 1370 {
1369 .start = 0x2021181C, 1371 .start = 0x2021180E, /* Device Ctl */
1370 .end = 0x2021181F, 1372 .end = 0x2021180E,
1371 .flags = IORESOURCE_MEM, 1373 .flags = IORESOURCE_MEM,
1372 }, 1374 },
1373}; 1375};
@@ -1527,7 +1529,8 @@ static int __init stamp_init(void)
1527 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices)); 1529 platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
1528 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info)); 1530 spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
1529 1531
1530#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE) 1532#if (defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)) \
1533 && defined(PATA_INT)
1531 irq_desc[PATA_INT].status |= IRQ_NOAUTOEN; 1534 irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
1532#endif 1535#endif
1533 1536