On Fri, 12 Sep 2014, Sean Cross wrote: > The stmpe_platform_data has a irq_over_gpio field, which allows the > system to read STMPE events whenever an IRQ occurs on a GPIO pin. > This patch adds the ability to configure this field and to use a GPIO > as an IRQ source for boards configuring the STMPE in device tree. > > Signed-off-by: Sean Cross <xobs@xxxxxxxxxx> > --- > drivers/mfd/stmpe.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Applied, thanks. > diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c > index 3b6bfa7..4c42b05 100644 > --- a/drivers/mfd/stmpe.c > +++ b/drivers/mfd/stmpe.c > @@ -1122,7 +1122,12 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata, > if (pdata->id < 0) > pdata->id = -1; > > - pdata->irq_trigger = IRQF_TRIGGER_NONE; > + pdata->irq_gpio = of_get_named_gpio_flags(np, "irq-gpio", 0, > + &pdata->irq_trigger); > + if (gpio_is_valid(pdata->irq_gpio)) > + pdata->irq_over_gpio = 1; > + else > + pdata->irq_trigger = IRQF_TRIGGER_NONE; > > of_property_read_u32(np, "st,autosleep-timeout", > &pdata->autosleep_timeout); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html