2012-10-03 13:23:12

by Ashish Jangam

Subject: [PATCH] [PATCH v3] mfd: da9052-core: Use regmap_irq_get_virq() and fix the probe

Fix for da9052-core driver probe fail on a mx53qsb dt-kernel
da9052 1-0048: DA9052 ADC IRQ failed ret=-22

Signed-off-by: Ashish Jangam <[email protected]>
---
changes since v3:
- remove element "irq" from struct da9052
- add inline da9052_map_irq() that calls regmap_irq_get_virq()
Changes since v2:
- Use regmap_irq_get_virq() instead of relying on irq_base
---
drivers/mfd/da9052-core.c | 31 ++++++++++++++++---------------
include/linux/mfd/da9052/da9052.h | 5 +++++
2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c
index 2544910..e38c2e0 100644
--- a/drivers/mfd/da9052-core.c
+++ b/drivers/mfd/da9052-core.c
@@ -772,7 +772,7 @@ EXPORT_SYMBOL_GPL(da9052_regmap_config);
int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)
{
struct da9052_pdata *pdata = da9052->dev->platform_data;
- int ret;
+ int ret, adc_irq;

mutex_init(&da9052->auxadc_lock);
init_completion(&da9052->done);
@@ -782,25 +782,26 @@ int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)

da9052->chip_id = chip_id;

- if (!pdata || !pdata->irq_base)
- da9052->irq_base = -1;
- else
- da9052->irq_base = pdata->irq_base;
-
ret = regmap_add_irq_chip(da9052->regmap, da9052->chip_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
- da9052->irq_base, &da9052_regmap_irq_chip,
+ -1, &da9052_regmap_irq_chip,
&da9052->irq_data);
- if (ret < 0)
+ if (ret < 0) {
+ dev_err(da9052->dev, "regmap_add_irq_chip failed: %d\n", ret);
goto regmap_err;
+ }

da9052->irq_base = regmap_irq_chip_get_base(da9052->irq_data);

- ret = request_threaded_irq(DA9052_IRQ_ADC_EOM, NULL, da9052_auxadc_irq,
- IRQF_TRIGGER_LOW | IRQF_ONESHOT,
- "adc irq", da9052);
- if (ret != 0)
- dev_err(da9052->dev, "DA9052 ADC IRQ failed ret=%d\n", ret);
+ adc_irq = da9052_map_irq(da9052, DA9052_IRQ_ADC_EOM);
+ if (adc_irq >= 0) {
+ ret = request_threaded_irq(adc_irq, NULL, da9052_auxadc_irq,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ "adc-irq", da9052);
+ if (ret != 0)
+ dev_err(da9052->dev, "DA9052 ADC IRQ failed ret=%d\n",
+ ret);
+ }

ret = mfd_add_devices(da9052->dev, -1, da9052_subdev_info,
ARRAY_SIZE(da9052_subdev_info), NULL, 0);
@@ -810,7 +811,7 @@ int __devinit da9052_device_init(struct da9052 *da9052, u8 chip_id)
return 0;

err:
- free_irq(DA9052_IRQ_ADC_EOM, da9052);
+ free_irq(adc_irq, da9052);
mfd_remove_devices(da9052->dev);
regmap_err:
return ret;
@@ -818,7 +819,7 @@ regmap_err:

void da9052_device_exit(struct da9052 *da9052)
{
- free_irq(DA9052_IRQ_ADC_EOM, da9052);
+ free_irq(da9052_map_irq(da9052, DA9052_IRQ_ADC_EOM), da9052);
regmap_del_irq_chip(da9052->chip_irq, da9052->irq_data);
mfd_remove_devices(da9052->dev);
}
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h
index 0507c4c..1abce88 100644
--- a/include/linux/mfd/da9052/da9052.h
+++ b/include/linux/mfd/da9052/da9052.h
@@ -141,6 +141,11 @@ static inline int da9052_reg_update(struct da9052 *da9052, unsigned char reg,
return regmap_update_bits(da9052->regmap, reg, bit_mask, reg_val);
}

+static inline int da9052_map_irq(struct da9052 *da9052, int irq)
+{
+ return regmap_irq_get_virq(da9052->irq_data, irq);
+}
+
int da9052_device_init(struct da9052 *da9052, u8 chip_id);
void da9052_device_exit(struct da9052 *da9052);

--
1.7.0.4

2012-10-03 18:28:09

by Mark Brown

Subject: Re: [PATCH] [PATCH v3] mfd: da9052-core: Use regmap_irq_get_virq() and fix the probe

On Wed, Oct 03, 2012 at 07:03:13PM +0530, Ashish Jangam wrote:
> Fix for da9052-core driver probe fail on a mx53qsb dt-kernel
> da9052 1-0048: DA9052 ADC IRQ failed ret=-22
>
> Signed-off-by: Ashish Jangam <[email protected]>

Reviwed-by: Mark Brown <[email protected]>