lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 070/272] ARM: OMAP2+: irq, AM33XX add missing register check
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Markus Pargmann <mpa@pengutronix.de>

    commit 0bebda684857f76548ea48c8886785198701d8d3 upstream.

    am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending
    interrupts. This patch adds AM33XX to the ifdef of SOCs that have to
    check this register.

    Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/arm/mach-omap2/irq.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
    index 3926f37..e022a86 100644
    --- a/arch/arm/mach-omap2/irq.c
    +++ b/arch/arm/mach-omap2/irq.c
    @@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs
    goto out;

    irqnr = readl_relaxed(base_addr + 0xd8);
    -#ifdef CONFIG_SOC_TI81XX
    +#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
    if (irqnr)
    goto out;
    irqnr = readl_relaxed(base_addr + 0xf8);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:41    [W:3.916 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site