The patch titled mfd: support active high IRQs on WM835x has been added to the -mm tree. Its filename is mfd-support-active-high-irqs-on-wm835x.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mfd: support active high IRQs on WM835x From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mfd/wm8350-core.c | 16 +++++++++++++++- include/linux/mfd/wm8350/core.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff -puN drivers/mfd/wm8350-core.c~mfd-support-active-high-irqs-on-wm835x drivers/mfd/wm8350-core.c --- a/drivers/mfd/wm8350-core.c~mfd-support-active-high-irqs-on-wm835x +++ a/drivers/mfd/wm8350-core.c @@ -1432,7 +1432,21 @@ int wm8350_device_init(struct wm8350 *wm 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", diff -puN include/linux/mfd/wm8350/core.h~mfd-support-active-high-irqs-on-wm835x include/linux/mfd/wm8350/core.h --- a/include/linux/mfd/wm8350/core.h~mfd-support-active-high-irqs-on-wm835x +++ a/include/linux/mfd/wm8350/core.h @@ -640,9 +640,11 @@ struct wm8350 { * * @init: Function called during driver initialisation. Should be * used by the platform to configure GPIO functions and similar. + * @irq_high: Set if WM8350 IRQ is active high. */ struct wm8350_platform_data { int (*init)(struct wm8350 *wm8350); + int irq_high; }; _ Patches currently in -mm which might be from broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch mfd-improve-diagnostics-for-wm8350-id-register-probe.patch mfd-support-active-high-irqs-on-wm835x.patch mfd-ensure-all-wm8350-irqs-are-masked-at-startup.patch mfd-initialise-wm8350-interrupts-earlier.patch mfd-mark-wm835x-usb_slv_500ma-bit-as-accessible.patch rtc-convert-wm8350-use-new-alarm-and-update-operations.patch rtc-wm8350-retries-will-reach-1.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html