Unverified Commit f33a751d authored by Aidan MacDonald's avatar Aidan MacDonald Committed by Mark Brown
Browse files

regmap-irq: Remove virtual registers 



No remaining users, and it's been replaced by config registers.

Signed-off-by: default avatarAidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20230509110100.3980123-3-aidanmacdonald.0x0@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 212bc1ce

drivers/base/regmap/regmap-irq.c

+0 −48
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ struct regmap_irq_chip_data { 
	unsigned int *wake_buf;

	unsigned int *type_buf;

	unsigned int *type_buf_def;

	unsigned int **virt_buf;

	unsigned int **config_buf;



	unsigned int irq_reg_stride;
@@ -196,20 +195,6 @@ static void regmap_irq_sync_unlock(struct irq_data *data) 
		}

	}



	if (d->chip->num_virt_regs) {

		for (i = 0; i < d->chip->num_virt_regs; i++) {

			for (j = 0; j < d->chip->num_regs; j++) {

				reg = d->get_irq_reg(d, d->chip->virt_reg_base[i],

						     j);

				ret = regmap_write(map, reg, d->virt_buf[i][j]);

				if (ret != 0)

					dev_err(d->map->dev,

						"Failed to write virt 0x%x: %d\n",

						reg, ret);

			}

		}

	}



	for (i = 0; i < d->chip->num_config_bases; i++) {

		for (j = 0; j < d->chip->num_config_regs; j++) {

			reg = d->get_irq_reg(d, d->chip->config_base[i], j);
@@ -320,13 +305,6 @@ static int regmap_irq_set_type(struct irq_data *data, unsigned int type) 
		return -EINVAL;

	}



	if (d->chip->set_type_virt) {

		ret = d->chip->set_type_virt(d->virt_buf, type, data->hwirq,

					     reg);

		if (ret)

			return ret;

	}



	if (d->chip->set_type_config) {

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

					       reg, d->chip->irq_drv_data);
@@ -758,9 +736,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, 
	if (chip->num_type_reg)

		dev_warn(map->dev, "type registers are deprecated; use config registers instead");



	if (chip->num_virt_regs || chip->virt_reg_base || chip->set_type_virt)

		dev_warn(map->dev, "virtual registers are deprecated; use config registers instead");



	if (irq_base) {

		irq_base = irq_alloc_descs(irq_base, 0, chip->num_irqs, 0);

		if (irq_base < 0) {
@@ -824,24 +799,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, 
			goto err_alloc;

	}



	if (chip->num_virt_regs) {

		/*

		 * Create virt_buf[chip->num_extra_config_regs][chip->num_regs]

		 */

		d->virt_buf = kcalloc(chip->num_virt_regs, sizeof(*d->virt_buf),

				      GFP_KERNEL);

		if (!d->virt_buf)

			goto err_alloc;



		for (i = 0; i < chip->num_virt_regs; i++) {

			d->virt_buf[i] = kcalloc(chip->num_regs,

						 sizeof(**d->virt_buf),

						 GFP_KERNEL);

			if (!d->virt_buf[i])

				goto err_alloc;

		}

	}



	if (chip->num_config_bases && chip->num_config_regs) {

		/*

		 * Create config_buf[num_config_bases][num_config_regs]
@@ -1063,11 +1020,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode, 
	kfree(d->mask_buf);

	kfree(d->status_buf);

	kfree(d->status_reg_buf);

	if (d->virt_buf) {

		for (i = 0; i < chip->num_virt_regs; i++)

			kfree(d->virt_buf[i]);

		kfree(d->virt_buf);

	}

	if (d->config_buf) {

		for (i = 0; i < chip->num_config_bases; i++)

			kfree(d->config_buf[i]);

include/linux/regmap.h

+0 −12
Original line number Diff line number Diff line
@@ -1544,8 +1544,6 @@ struct regmap_irq_chip_data; 
 * @wake_base:   Base address for wake enables.  If zero unsupported.

 * @type_base:   Base address for irq type.  If zero unsupported.  Deprecated,

 *		 use @config_base instead.

 * @virt_reg_base:   Base addresses for extra config regs. Deprecated, use

 *		     @config_base instead.

 * @config_base: Base address for IRQ type config regs. If null unsupported.

 * @irq_reg_stride:  Stride to use for chips where registers are not contiguous.

 * @init_ack_masked: Ack all masked interrupts once during initalization.
@@ -1586,9 +1584,6 @@ struct regmap_irq_chip_data; 
 *

 * @num_type_reg:    Number of type registers. Deprecated, use config registers

 *		     instead.

 * @num_virt_regs:   Number of non-standard irq configuration registers.

 *		     If zero unsupported. Deprecated, use config registers

 *		     instead.

 * @num_config_bases:	Number of config base registers.

 * @num_config_regs:	Number of config registers for each config base register.

 *
@@ -1598,9 +1593,6 @@ struct regmap_irq_chip_data; 
 *		     after handling the interrupts in regmap_irq_handler().

 * @handle_mask_sync: Callback used to handle IRQ mask syncs. The index will be

 *		      in the range [0, num_regs)

 * @set_type_virt:   Driver specific callback to extend regmap_irq_set_type()

 *		     and configure virt regs. Deprecated, use @set_type_config

 *		     callback and config registers instead.

 * @set_type_config: Callback used for configuring irq types.

 * @get_irq_reg: Callback for mapping (base register, index) pairs to register

 *		 addresses. The base register will be one of @status_base,
@@ -1630,7 +1622,6 @@ struct regmap_irq_chip { 
	unsigned int ack_base;

	unsigned int wake_base;

	unsigned int type_base;

	unsigned int *virt_reg_base;

	const unsigned int *config_base;

	unsigned int irq_reg_stride;

	unsigned int init_ack_masked:1;
@@ -1652,7 +1643,6 @@ struct regmap_irq_chip { 
	int num_irqs;



	int num_type_reg;

	int num_virt_regs;

	int num_config_bases;

	int num_config_regs;
@@ -1660,8 +1650,6 @@ struct regmap_irq_chip { 
	int (*handle_post_irq)(void *irq_drv_data);

	int (*handle_mask_sync)(int index, unsigned int mask_buf_def,

				unsigned int mask_buf, void *irq_drv_data);

	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,

			       void *irq_drv_data);