Unverified Commit 383b3232 authored by Mark Brown's avatar Mark Brown
Browse files

Migrate the PCIe-IDIO-24 and WS16C48 GPIO drivers 

Merge series from William Breathitt Gray <william.gray@linaro.org>:

The regmap API supports IO port accessors so we can take advantage of
regmap abstractions rather than handling access to the device registers
directly in the driver.

A patch to pass irq_drv_data as a parameter for struct regmap_irq_chip
set_type_config() is included. This is needed by the
idio_24_set_type_config() and ws16c48_set_type_config() callbacks in
order to update the type configuration on their respective devices.
parents fac79bad 7697c64b

drivers/base/regmap/regmap-irq.c

+5 −3
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ static int regmap_irq_set_type(struct irq_data *data, unsigned int type) 
	}



	if (d->chip->set_type_config) {

		ret = d->chip->set_type_config(d->config_buf, type,

					       irq_data, reg);

		ret = d->chip->set_type_config(d->config_buf, type, irq_data,

					       reg, d->chip->irq_drv_data);

		if (ret)

			return ret;

	}
@@ -654,13 +654,15 @@ EXPORT_SYMBOL_GPL(regmap_irq_get_irq_reg_linear); 
 * @type: The requested IRQ type.

 * @irq_data: The IRQ being configured.

 * @idx: Index of the irq's config registers within each array `buf[i]`

 * @irq_drv_data: Driver specific IRQ data

 *

 * This is a &struct regmap_irq_chip->set_type_config callback suitable for

 * chips with one config register. Register values are updated according to

 * the &struct regmap_irq_type data associated with an IRQ.

 */

int regmap_irq_set_type_config_simple(unsigned int **buf, unsigned int type,

				      const struct regmap_irq *irq_data, int idx)

				      const struct regmap_irq *irq_data,

				      int idx, void *irq_drv_data)

{

	const struct regmap_irq_type *t = &irq_data->type;

include/linux/regmap.h

+4 −2
Original line number Diff line number Diff line
@@ -1655,7 +1655,8 @@ struct regmap_irq_chip { 
	int (*set_type_virt)(unsigned int **buf, unsigned int type,

			     unsigned long hwirq, int reg);

	int (*set_type_config)(unsigned int **buf, unsigned int type,

			       const struct regmap_irq *irq_data, int idx);

			       const struct regmap_irq *irq_data, int idx,

			       void *irq_drv_data);

	unsigned int (*get_irq_reg)(struct regmap_irq_chip_data *data,

				    unsigned int base, int index);

	void *irq_drv_data;
@@ -1664,7 +1665,8 @@ struct regmap_irq_chip { 
unsigned int regmap_irq_get_irq_reg_linear(struct regmap_irq_chip_data *data,

					   unsigned int base, int index);

int regmap_irq_set_type_config_simple(unsigned int **buf, unsigned int type,

				      const struct regmap_irq *irq_data, int idx);

				      const struct regmap_irq *irq_data,

				      int idx, void *irq_drv_data);



int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,

			int irq_base, const struct regmap_irq_chip *chip,