On Wed, 2013-07-03 at 17:12 +0200, Javier Martinez Canillas wrote: > On Wed, Jul 3, 2013 at 4:15 PM, Luciano Coelho <coelho@xxxxxx> wrote: > > On Wed, 2013-07-03 at 17:03 +0300, Luciano Coelho wrote: > >> The platform_quirk element in the platform data was used to change the > >> way the IRQ is triggered. When set, the EDGE_IRQ quirk would change > >> the irqflags used and treat edge trigger differently from the rest. > >> > >> Instead of hiding this irq flag setting behind the quirk, have the > >> board files set the flags during initialization. This will be more > >> meaningful than driver-specific quirks when we switch to DT. > >> > >> Additionally, fix missing gpio_request() calls in the boarding files > >> (so that setting the flags actually works). > >> > >> Cc: Tony Lindgren <tony@xxxxxxxxxxx> > >> Cc: Sekhar Nori <nsekhar@xxxxxx> > >> Signed-off-by: Luciano Coelho <coelho@xxxxxx> > >> --- > > > > [...] > > > >> @@ -5928,16 +5927,21 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) > >> wlcore_adjust_conf(wl); > >> > >> wl->irq = platform_get_irq(pdev, 0); > >> - wl->platform_quirks = pdata->platform_quirks; > >> wl->if_ops = pdev_data->if_ops; > >> > >> - if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ) > >> - irqflags = IRQF_TRIGGER_RISING; > >> - else > >> - irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT; > >> + irq_data = irq_get_irq_data(wl->irq); > >> + if (!irq_data) { > >> + wl1271_error("couldn't get irq data for irq %d\n", wl->irq); > >> + ret = -EINVAL; > >> + goto out_free_nvs; > >> + } > >> + > >> + wl->irq_flags = irqd_get_trigger_type(irq_data); > > > > BTW, there seems to be a patch on its way to make reading the flags > > easier (ie. no need to get the irq_data first): > > > > http://mid.gmane.org/1367945288-5625-1-git-send-email-javier@xxxxxxxxxxxx > > > > I'm not sure if this is going to be taken in, but if it does, it would > > be nice to change the code here to use the new irq_get_trigger_type() > > function. > That patch has been already merged in Linus tree as commit 1f6236bf > ("genirq: Add irq_get_trigger_type() to get IRQ flags"). > > So yes, it would be better if you can use irq_get_trigger_type() > instead calling irq_get_irq_data() + irqd_get_trigger_type(). That's great, thanks! I'll make this change as soon as I get your patch into my tree (ie. after the merge window closes). -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html