lkml.org 
[lkml]   [2022]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/49] regmap-irq: Remove virtual registers support
    Date
    Virtual registers can be removed, since config registers implement
    the same functionality.

    Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
    ---
    drivers/base/regmap/regmap-irq.c | 42 --------------------------------
    include/linux/regmap.h | 9 -------
    2 files changed, 51 deletions(-)

    diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
    index be35f2e41b8c..5a3e255816fd 100644
    --- a/drivers/base/regmap/regmap-irq.c
    +++ b/drivers/base/regmap/regmap-irq.c
    @@ -38,7 +38,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;
    @@ -218,20 +217,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 = sub_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 = sub_irq_reg(d, d->chip->config_base[i], j);
    @@ -346,10 +331,6 @@ static int regmap_irq_set_type(struct irq_data *data, unsigned int type)
    return -EINVAL;
    }

    - if (d->chip->set_type_virt)
    - return d->chip->set_type_virt(d->virt_buf, type, data->hwirq,
    - reg);
    -
    return 0;
    }

    @@ -782,24 +763,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(unsigned int),
    - 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]
    @@ -989,11 +952,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]);
    diff --git a/include/linux/regmap.h b/include/linux/regmap.h
    index e48d65756fb4..bb8c89a83b51 100644
    --- a/include/linux/regmap.h
    +++ b/include/linux/regmap.h
    @@ -1459,7 +1459,6 @@ struct regmap_irq_sub_irq_map {
    * Using zero value is possible with @use_ack bit.
    * @wake_base: Base address for wake enables. If zero unsupported.
    * @type_base: Base address for irq type. If zero unsupported.
    - * @virt_reg_base: Base addresses for extra config regs.
    * @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.
    @@ -1486,8 +1485,6 @@ struct regmap_irq_sub_irq_map {
    * assigned based on the index in the array of the interrupt.
    * @num_irqs: Number of descriptors.
    * @num_type_reg: Number of type registers.
    - * @num_virt_regs: Number of non-standard irq configuration registers.
    - * If zero unsupported.
    * @type_reg_stride: Stride to use for chips where type registers are not
    * contiguous.
    * @num_config_bases: Number of config base registers.
    @@ -1496,8 +1493,6 @@ struct regmap_irq_sub_irq_map {
    * before regmap_irq_handler process the interrupts.
    * @handle_post_irq: Driver specific callback to handle interrupt from device
    * after handling the interrupts in regmap_irq_handler().
    - * @set_type_virt: Driver specific callback to extend regmap_irq_set_type()
    - * and configure virt regs.
    * @set_type_config: Callback used for configuring irq types.
    * @irq_drv_data: Driver specific IRQ data which is passed as parameter when
    * driver specific pre/post interrupt handler is called.
    @@ -1520,7 +1515,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;
    bool mask_writeonly:1;
    @@ -1543,15 +1537,12 @@ struct regmap_irq_chip {
    int num_irqs;

    int num_type_reg;
    - int num_virt_regs;
    int num_config_bases;
    int num_config_regs;
    unsigned int type_reg_stride;

    int (*handle_pre_irq)(void *irq_drv_data);
    int (*handle_post_irq)(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;
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-06-20 22:07    [W:2.817 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site