lkml.org 
[lkml]   [2009]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/62] Blackfin: fix up PATA resource handling in bf537-stamp
    Date
    From: Michael Hennerich <michael.hennerich@analog.com>

    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 | 15 +++++++++------
    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 0572926..9bd0a80 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[] = {
    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

    --
    1.6.3.1


    \
     
     \ /
      Last update: 2009-06-05 10:13    [W:2.975 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site