Messages in this thread | | | From | Adam Thomson <> | Subject | RE: [PATCH V3] mfd: da9062: add support for interrupt polarity defined in device tree | Date | Wed, 12 Feb 2020 12:41:15 +0000 |
| |
On 06 February 2020 07:31, Shreyas Joshi wrote:
> The da9062 interrupt handler cannot necessarily be low active. > Add a function to configure the interrupt type based on what is defined in the > device tree. The allowable interrupt type is either low or high level trigger. > > Signed-off-by: Shreyas Joshi <shreyas.joshi@biamp.com> > --- > drivers/mfd/da9062-core.c | 38 +++++++++++++++++++++++++++++++++++--- > 1 file changed, 35 insertions(+), 3 deletions(-) > > diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c > index 419c73533401..c44a48ba3d05 100644 > --- a/drivers/mfd/da9062-core.c > +++ b/drivers/mfd/da9062-core.c > @@ -369,6 +369,32 @@ static int da9062_get_device_type(struct da9062 *chip) > return ret; > } > > +static u32 da9062_configure_irq_type(struct da9062 *chip, int irq, u32 *trigger) > +{ > + u32 irq_type = 0; > + struct irq_data *irq_data = irq_get_irq_data(irq); > + > + if (!irq_data) { > + dev_err(chip->dev, "Invalid IRQ: %d\n", irq); > + return -EINVAL; > + } > + *trigger = irqd_get_trigger_type(irq_data); > + > + switch (*trigger) { > + case IRQ_TYPE_LEVEL_HIGH: > + irq_type = 1; > + break; > + case IRQ_TYPE_LEVEL_LOW: > + irq_type = 0; > + break; > + default: > + dev_warn(chip->dev, "Unsupported IRQ type: %d\n", *trigger); > + return -EIO;
Don't think EIO is the correct return code. Think EINVAL is more appropriate.
> + }
Indentation here for closing bracket isn't right. Make sure you run this through the checkpatch.pl script.
> + return regmap_update_bits(chip->regmap, DA9062AA_CONFIG_A, > + DA9062AA_IRQ_TYPE_MASK, irq_type); > +}
This won't work. 'irq_type' needs to be shifted the correct number of bits. See DA9062AA_IRQ_TYPE_SHIFT.
> + > static const struct regmap_range da9061_aa_readable_ranges[] = { > regmap_reg_range(DA9062AA_PAGE_CON, DA9062AA_STATUS_B), > regmap_reg_range(DA9062AA_STATUS_D, DA9062AA_EVENT_C), > @@ -417,6 +443,7 @@ static const struct regmap_range > da9061_aa_writeable_ranges[] = { > regmap_reg_range(DA9062AA_VBUCK1_A, DA9062AA_VBUCK4_A), > regmap_reg_range(DA9062AA_VBUCK3_A, DA9062AA_VBUCK3_A), > regmap_reg_range(DA9062AA_VLDO1_A, DA9062AA_VLDO4_A), > + regmap_reg_range(DA9062AA_CONFIG_A, DA9062AA_CONFIG_B), > regmap_reg_range(DA9062AA_VBUCK1_B, DA9062AA_VBUCK4_B), > regmap_reg_range(DA9062AA_VBUCK3_B, DA9062AA_VBUCK3_B), > regmap_reg_range(DA9062AA_VLDO1_B, DA9062AA_VLDO4_B), > @@ -596,6 +623,7 @@ static int da9062_i2c_probe(struct i2c_client *i2c, > const struct regmap_irq_chip *irq_chip; > const struct regmap_config *config; > int cell_num; > + u32 trigger_type = 0; > int ret; > > chip = devm_kzalloc(&i2c->dev, sizeof(*chip), GFP_KERNEL); > @@ -654,10 +682,14 @@ static int da9062_i2c_probe(struct i2c_client *i2c, > if (ret) > return ret; > > + if (da9062_configure_irq_type(chip, i2c->irq, &trigger_type) < 0) {
You're returning error codes from 'da9062_configure_irq_type' so why are you overriding what's returned with -EINVAL below?
> + dev_err(chip->dev, "Failed to configure IRQ type\n"); > + return -EINVAL; > + } > + > ret = regmap_add_irq_chip(chip->regmap, i2c->irq, > - IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED, > - -1, irq_chip, > - &chip->regmap_irq); > + trigger_type | IRQF_SHARED | IRQF_ONESHOT, > + -1, irq_chip, &chip->regmap_irq); > if (ret) { > dev_err(chip->dev, "Failed to request IRQ %d: %d\n", > i2c->irq, ret); > -- > 2.20.1
| |