Blackfin: fix up PATA resource handling in bf537-stamp
authorMichael Hennerich <michael.hennerich@analog.com>
Tue, 21 Apr 2009 12:05:50 +0000 (12:05 +0000)
committerMike Frysinger <vapier@gentoo.org>
Fri, 12 Jun 2009 10:03:46 +0000 (06:03 -0400)
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>
arch/blackfin/mach-bf537/boards/stamp.c

index 0572926da23f4ef81a2648b70a7f233c1a3b72fb..9bd0a809641bfb27cd20d4375a5aa9dfb64a225d 100644 (file)
@@ -1358,16 +1358,18 @@ static struct resource bfin_pata_resources[] = {
 static struct pata_platform_info bfin_pata_platform_data = {
        .ioport_shift = 0,
 };
-
+/* CompactFlash Storage Card Memory Mapped Adressing
+ * /REG = A11 = 1
+ */
 static struct resource bfin_pata_resources[] = {
        {
-               .start = 0x20211820,
-               .end = 0x2021183F,
+               .start = 0x20211800,
+               .end = 0x20211807,
                .flags = IORESOURCE_MEM,
        },
        {
-               .start = 0x2021181C,
-               .end = 0x2021181F,
+               .start = 0x2021180E,    /* Device Ctl */
+               .end = 0x2021180E,
                .flags = IORESOURCE_MEM,
        },
 };
@@ -1527,7 +1529,8 @@ static int __init stamp_init(void)
        platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
        spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#if (defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)) \
+        && defined(PATA_INT)
        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
 #endif