[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100407085035.GC2962@sortiz.org>
Date: Wed, 7 Apr 2010 10:50:36 +0200
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] mfd: Initialise WM831x IRQ masks on chip even if
interrupts not in use
Hi Mark,
On Mon, Apr 05, 2010 at 04:14:17PM +0100, Mark Brown wrote:
> Ensure that the hardware has interrupts masked if we are not using
> the interrupt controller on the WM831x by initialising the masks
> before we check for the setup data required for the IRQ line. This
> avoids signalling an unused IRQ line and improves the robustness
> of checks that the IRQ is in use.
Patch applied, thanks.
Cheers,
Samuel.
> Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> ---
> drivers/mfd/wm831x-irq.c | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
> index b1d66b8..f8b51be 100644
> --- a/drivers/mfd/wm831x-irq.c
> +++ b/drivers/mfd/wm831x-irq.c
> @@ -460,6 +460,14 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
>
> mutex_init(&wm831x->irq_lock);
>
> + /* Mask the individual interrupt sources */
> + for (i = 0; i < ARRAY_SIZE(wm831x->irq_masks_cur); i++) {
> + wm831x->irq_masks_cur[i] = 0xffff;
> + wm831x->irq_masks_cache[i] = 0xffff;
> + wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1_MASK + i,
> + 0xffff);
> + }
> +
> if (!irq) {
> dev_warn(wm831x->dev,
> "No interrupt specified - functionality limited\n");
> @@ -475,14 +483,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
> wm831x->irq = irq;
> wm831x->irq_base = pdata->irq_base;
>
> - /* Mask the individual interrupt sources */
> - for (i = 0; i < ARRAY_SIZE(wm831x->irq_masks_cur); i++) {
> - wm831x->irq_masks_cur[i] = 0xffff;
> - wm831x->irq_masks_cache[i] = 0xffff;
> - wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1_MASK + i,
> - 0xffff);
> - }
> -
> /* Register them with genirq */
> for (cur_irq = wm831x->irq_base;
> cur_irq < ARRAY_SIZE(wm831x_irqs) + wm831x->irq_base;
> --
> 1.7.0.3
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists