Re: [PATCH 1/2] mfd: Support active high IRQs on WM835x

[Andrew Morton]

On Mon, 26 Jan 2009 19:23:18 +0000
Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:

> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/mfd/wm8350-core.c       |   16 +++++++++++++++-
>  include/linux/mfd/wm8350/core.h |    2 ++
>  2 files changed, 17 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c
> index e5e82c7..908284c 100644
> --- a/drivers/mfd/wm8350-core.c
> +++ b/drivers/mfd/wm8350-core.c
> @@ -1423,7 +1423,21 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
>  	mutex_init(&wm8350->irq_mutex);
>  	INIT_WORK(&wm8350->irq_work, wm8350_irq_worker);
>  	if (irq) {
> -		ret = request_irq(irq, wm8350_irq, 0,
> +		int flags = 0;
> +
> +		if (pdata && pdata->irq_high) {
> +			flags |= IRQF_TRIGGER_HIGH;
> +
> +			wm8350_set_bits(wm8350, WM8350_SYSTEM_CONTROL_1,
> +					WM8350_IRQ_POL);
> +		} else {
> +			flags |= IRQF_TRIGGER_LOW;
> +
> +			wm8350_clear_bits(wm8350, WM8350_SYSTEM_CONTROL_1,
> +					  WM8350_IRQ_POL);
> +		}
> +
> +		ret = request_irq(irq, wm8350_irq, flags,
>  				  "wm8350", wm8350);
>  		if (ret != 0) {
>  			dev_err(wm8350->dev, "Failed to request IRQ: %d\n",

This conflicts a bit with your earlier
mfd-initialise-wm8350-interrupts-earlier.patch.

I had marked mfd-initialise-wm8350-interrupts-earlier.patch as
needed-in-2.6.29 so I reworked this patch to fit.

afacit we haven't heard from Sam in a couple of weeks.  If he's having
a bit of downtime I guess I'll merge

mfd-initialise-wm8350-interrupts-earlier.patch
mfd-mark-wm835x-usb_slv_500ma-bit-as-accessible.patch
mfd-pcf50633-terminate-i2c_device_id-list.patch

myself.  But I'll leave that a week or two yet.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/