Message ID | 1488300679-3259-5-git-send-email-fabrice.gasnier@st.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 28/02/17 16:51, Fabrice Gasnier wrote: > From: Grégor Boirie <gregor.boirie@parrot.com> > > Add compatible string that should be used in DT. > Also cascade of_node to newly allocated trigger device. > > Signed-off-by: Gregor Boirie <gregor.boirie@parrot.com> I'd normally not keep Gregor's sign off in a patch that has been changed like this. If Gregor is happy it's a different matter, but I suspect he hasn't replied yet as he is always very busy! > Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com> Otherwise, all good, subject to convincing the device tree guys about the binding. Jonathan > --- > Original PATCH from Gregor Boirie: > https://marc.info/?l=linux-iio&m=145590953607905&w=4 > > Updates: > - compatible string changed to "interrupt-trigger" > - cascade of_node down to iio trigger device > --- > drivers/iio/trigger/iio-trig-interrupt.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c > index e18f12b..6ee1f7e 100644 > --- a/drivers/iio/trigger/iio-trig-interrupt.c > +++ b/drivers/iio/trigger/iio-trig-interrupt.c > @@ -62,6 +62,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev) > } > iio_trigger_set_drvdata(trig, trig_info); > trig_info->irq = irq; > + trig->dev.of_node = pdev->dev.of_node; > trig->ops = &iio_interrupt_trigger_ops; > ret = request_irq(irq, iio_interrupt_trigger_poll, > irqflags, trig->name, trig); > @@ -104,11 +105,20 @@ static int iio_interrupt_trigger_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_OF > +static const struct of_device_id iio_interrupt_trigger_of_match[] = { > + { .compatible = "interrupt-trigger" }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, iio_interrupt_trigger_of_match); > +#endif > + > static struct platform_driver iio_interrupt_trigger_driver = { > .probe = iio_interrupt_trigger_probe, > .remove = iio_interrupt_trigger_remove, > .driver = { > .name = "iio_interrupt_trigger", > + .of_match_table = of_match_ptr(iio_interrupt_trigger_of_match), > }, > }; > >
diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c index e18f12b..6ee1f7e 100644 --- a/drivers/iio/trigger/iio-trig-interrupt.c +++ b/drivers/iio/trigger/iio-trig-interrupt.c @@ -62,6 +62,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev) } iio_trigger_set_drvdata(trig, trig_info); trig_info->irq = irq; + trig->dev.of_node = pdev->dev.of_node; trig->ops = &iio_interrupt_trigger_ops; ret = request_irq(irq, iio_interrupt_trigger_poll, irqflags, trig->name, trig); @@ -104,11 +105,20 @@ static int iio_interrupt_trigger_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id iio_interrupt_trigger_of_match[] = { + { .compatible = "interrupt-trigger" }, + {}, +}; +MODULE_DEVICE_TABLE(of, iio_interrupt_trigger_of_match); +#endif + static struct platform_driver iio_interrupt_trigger_driver = { .probe = iio_interrupt_trigger_probe, .remove = iio_interrupt_trigger_remove, .driver = { .name = "iio_interrupt_trigger", + .of_match_table = of_match_ptr(iio_interrupt_trigger_of_match), }, };