On Wed, 29 Mar 2017, Sebastian Reichel wrote: > CPCAP can sense if IRQ is currently set or not. This > functionality is required for a few subdevices, such > as the power button and usb phy modules. > > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> > --- > Changes since PATCHv3: > - add extern to function definition > - use BIT macro for mask variable > - avoid magic numbers > Changes since PATCHv4: > - rename base to irq_base > --- > drivers/mfd/motorola-cpcap.c | 28 ++++++++++++++++++++++++++++ > include/linux/mfd/motorola-cpcap.h | 2 ++ > 2 files changed, 30 insertions(+) Applied, thanks. > diff --git a/drivers/mfd/motorola-cpcap.c b/drivers/mfd/motorola-cpcap.c > index 6aeada7d7ce5..a9097efcefa5 100644 > --- a/drivers/mfd/motorola-cpcap.c > +++ b/drivers/mfd/motorola-cpcap.c > @@ -23,6 +23,8 @@ > > #define CPCAP_NR_IRQ_REG_BANKS 6 > #define CPCAP_NR_IRQ_CHIPS 3 > +#define CPCAP_REGISTER_SIZE 4 > +#define CPCAP_REGISTER_BITS 16 > > struct cpcap_ddata { > struct spi_device *spi; > @@ -32,6 +34,32 @@ struct cpcap_ddata { > struct regmap *regmap; > }; > > +static int cpcap_sense_irq(struct regmap *regmap, int irq) > +{ > + int regnum = irq / CPCAP_REGISTER_BITS; > + int mask = BIT(irq % CPCAP_REGISTER_BITS); > + int reg = CPCAP_REG_INTS1 + (regnum * CPCAP_REGISTER_SIZE); > + int err, val; > + > + if (reg < CPCAP_REG_INTS1 || reg > CPCAP_REG_INTS4) > + return -EINVAL; > + > + err = regmap_read(regmap, reg, &val); > + if (err) > + return err; > + > + return !!(val & mask); > +} > + > +int cpcap_sense_virq(struct regmap *regmap, int virq) > +{ > + struct regmap_irq_chip_data *d = irq_get_chip_data(virq); > + int irq_base = regmap_irq_chip_get_base(d); > + > + return cpcap_sense_irq(regmap, virq - irq_base); > +} > +EXPORT_SYMBOL_GPL(cpcap_sense_virq); > + > static int cpcap_check_revision(struct cpcap_ddata *cpcap) > { > u16 vendor, rev; > diff --git a/include/linux/mfd/motorola-cpcap.h b/include/linux/mfd/motorola-cpcap.h > index b4031c2b2214..793aa695faa0 100644 > --- a/include/linux/mfd/motorola-cpcap.h > +++ b/include/linux/mfd/motorola-cpcap.h > @@ -290,3 +290,5 @@ static inline int cpcap_get_vendor(struct device *dev, > > return 0; > } > + > +extern int cpcap_sense_virq(struct regmap *regmap, int virq); -- 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 linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html