Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cc4b1a9 authored by Sricharan R's avatar Sricharan R
Browse files

ARM: OMAP4+: Correct Wakeup-gen code to use physical irq number 



The wakeup gen mask/unmask callback uses the irq element of the
irq_data to setup. The irq is the linux virtual irq number and
is same as the hardware irq number only when the parent irqchip
is setup as a legacy domain. When it is used as a linear domain,
the virtual irqs are allocated dynamically and wakeup gen code
cannot rely on these numbers to access the irq registers. Instead
use the hwirq element of the irq_data which represent the physical
irq number.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: default avatarSricharan R <r.sricharan@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 96ca848e

arch/arm/mach-omap2/omap-wakeupgen.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ static void wakeupgen_mask(struct irq_data *d) 
	unsigned long flags;

	unsigned long flags;





	raw_spin_lock_irqsave(&wakeupgen_lock, flags);

	raw_spin_lock_irqsave(&wakeupgen_lock, flags);

	_wakeupgen_clear(d->irq, irq_target_cpu[d->irq]);

	_wakeupgen_clear(d->hwirq, irq_target_cpu[d->hwirq]);

	raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);

	raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);

}

}
@@ -150,7 +150,7 @@ static void wakeupgen_unmask(struct irq_data *d) 
	unsigned long flags;

	unsigned long flags;





	raw_spin_lock_irqsave(&wakeupgen_lock, flags);

	raw_spin_lock_irqsave(&wakeupgen_lock, flags);

	_wakeupgen_set(d->irq, irq_target_cpu[d->irq]);

	_wakeupgen_set(d->hwirq, irq_target_cpu[d->hwirq]);

	raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);

	raw_spin_unlock_irqrestore(&wakeupgen_lock, flags);

}

}