Re: [PATCH v2] gpio: pca953x: add PCAL9535 interrupt support for Galileo Gen2

[Andy Shevchenko]

On Thu, 2016-04-07 at 12:56 +0800, Yong Li wrote:
> Galileo Gen2 board uses the PCAL9535 as the GPIO expansion,
> it is different from PCA9535 and includes interrupt mask/status
> registers,
> The current driver does not support the interrupt registers
> configuration,
> it causes some gpio pins cannot trigger interrupt events,
> this patch fix this issue. The original patch was submitted by
> Josef Ahmad <josef.ahmad@xxxxxxxxxxxxxxx>
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-quark/tree/recipe
> s-kernel/linux/files/0015-Quark-GPIO-1-2-quark.patch
> 

FWIW:
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

> Signed-off-by: Yong Li <yong.b.li@xxxxxxxxx>
> ---
> Âdrivers/gpio/gpio-pca953x.c | 42
> +++++++++++++++++++++++++++++++++++++++++-
> Â1 file changed, 41 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
> index e66084c..5e3be32 100644
> --- a/drivers/gpio/gpio-pca953x.c
> +++ b/drivers/gpio/gpio-pca953x.c
> @@ -38,8 +38,13 @@
> Â#define PCA957X_MSK		6
> Â#define PCA957X_INTS		7
> Â
> +#define PCAL953X_IN_LATCH	34
> +#define PCAL953X_INT_MASK	37
> +#define PCAL953X_INT_STAT	38
> +
> Â#define PCA_GPIO_MASK		0x00FF
> Â#define PCA_INT			0x0100
> +#define PCA_PCAL			0x0200
> Â#define PCA953X_TYPE		0x1000
> Â#define PCA957X_TYPE		0x2000
> Â#define PCA_TYPE_MASK		0xF000
> @@ -77,7 +82,7 @@ static const struct i2c_device_id pca953x_id[] = {
> ÂMODULE_DEVICE_TABLE(i2c, pca953x_id);
> Â
> Âstatic const struct acpi_device_id pca953x_acpi_ids[] = {
> -	{ "INT3491", 16 | PCA953X_TYPE | PCA_INT, },
> +	{ "INT3491", 16 | PCA953X_TYPE | PCA_INT | PCA_PCAL, },
> Â	{ }
> Â};
> ÂMODULE_DEVICE_TABLE(acpi, pca953x_acpi_ids);
> @@ -437,6 +442,18 @@ static void pca953x_irq_bus_sync_unlock(struct
> irq_data *d)
> Â	struct pca953x_chip *chip = gpiochip_get_data(gc);
> Â	u8 new_irqs;
> Â	int level, i;
> +	u8 invert_irq_mask[MAX_BANK];
> +
> +	if (chip->driver_data & PCA_PCAL) {
> +		/* Enable latch on interrupt-enabled inputs */
> +		pca953x_write_regs(chip, PCAL953X_IN_LATCH, chip-
> >irq_mask);
> +
> +		for (i = 0; i < NBANK(chip); i++)
> +			invert_irq_mask[i] = ~chip->irq_mask[i];
> +
> +		/* Unmask enabled interrupts */
> +		pca953x_write_regs(chip, PCAL953X_INT_MASK,
> invert_irq_mask);
> +	}
> Â
> Â	/* Look for any newly setup interrupt */
> Â	for (i = 0; i < NBANK(chip); i++) {
> @@ -498,6 +515,29 @@ static bool pca953x_irq_pending(struct
> pca953x_chip *chip, u8 *pending)
> Â	u8 trigger[MAX_BANK];
> Â	int ret, i, offset = 0;
> Â
> +	if (chip->driver_data & PCA_PCAL) {
> +		/* Read the current interrupt status from the device
> */
> +		ret = pca953x_read_regs(chip, PCAL953X_INT_STAT,
> trigger);
> +		if (ret)
> +			return false;
> +
> +		/* Check latched inputs and clear interrupt status */
> +		ret = pca953x_read_regs(chip, PCA953X_INPUT,
> cur_stat);
> +		if (ret)
> +			return false;
> +
> +		for (i = 0; i < NBANK(chip); i++) {
> +			/* Apply filter for rising/falling edge
> selection */
> +			pending[i] = (~cur_stat[i] & chip-
> >irq_trig_fall[i]) |
> +				(cur_stat[i] & chip-
> >irq_trig_raise[i]);
> +			pending[i] &= trigger[i];
> +			if (pending[i])
> +				pending_seen = true;
> +		}
> +
> +		return pending_seen;
> +	}
> +
> Â	switch (chip->chip_type) {
> Â	case PCA953X_TYPE:
> Â		offset = PCA953X_INPUT;

-- 
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy