On Tue, Oct 13, 2015 at 05:58:28PM +0200, Martin Kepplinger wrote: > This change is important in order for everyone to be easily able to use the > driver for one of the supported accelerometer chips! > > Until now, the driver blindly assumed that the INT1 interrupt line is wired > on a user's board. But these devices have 2 interrupt lines and can route > their different interrupt sources to one of them. Since only their motion > detection interrupt source is implemented as IIO events, users just use > either one of the pins. > > client->irq is not changed because only one interrupt line is supported. > The user is warned if she describes both interrupt pins in the dts. If the hardware has both wired up, the DT should describe both. The fact that a kernel might only use one is irrelevant to the binding. You need to handle the case that both are wired up. [...] > + - interrupt-names: should contain "INT1" or "INT2", the accelerometer's > + interrupt line in use. This "or" should be "and/or". [...] > diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c > index 1eccc2d..dbfd0b4 100644 > --- a/drivers/iio/accel/mma8452.c > +++ b/drivers/iio/accel/mma8452.c > @@ -29,6 +29,7 @@ > #include <linux/iio/events.h> > #include <linux/delay.h> > #include <linux/of_device.h> > +#include <linux/of_irq.h> > > #define MMA8452_STATUS 0x00 > #define MMA8452_STATUS_DRDY (BIT(2) | BIT(1) | BIT(0)) > @@ -1130,13 +1131,26 @@ static int mma8452_probe(struct i2c_client *client, > MMA8452_INT_FF_MT; > int enabled_interrupts = MMA8452_INT_TRANS | > MMA8452_INT_FF_MT; > + int irq1, irq2; > > - /* Assume wired to INT1 pin */ > - ret = i2c_smbus_write_byte_data(client, > - MMA8452_CTRL_REG5, > - supported_interrupts); > - if (ret < 0) > - return ret; > + irq1 = of_irq_get_byname(client->dev.of_node, "INT1"); > + irq2 = of_irq_get_byname(client->dev.of_node, "INT2"); > + > + if (irq1 > 0 && irq2 > 0) > + dev_warn(&client->dev, > + "only one interrupt line supported\n"); dev_info(&client->dev, "INT1 and INT2 present."); This is a valid case, and does not require a warning. Thanks, Mark. -- 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
