diff options
| author | Kim, Milo <Milo.Kim@ti.com> | 2012-10-18 06:11:33 +0000 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-11-17 20:40:59 -0800 |
| commit | 968a47836c7f9dc6a3987f846bb7e095d30b86ec (patch) | |
| tree | a3e03713a028f786974a01d9ca8aa038b92b25bc | |
| parent | 952aeeb3ee28bc12a70744e40636de40688eb60d (diff) | |
| download | kernel_goldelico_gta04-968a47836c7f9dc6a3987f846bb7e095d30b86ec.zip kernel_goldelico_gta04-968a47836c7f9dc6a3987f846bb7e095d30b86ec.tar.gz kernel_goldelico_gta04-968a47836c7f9dc6a3987f846bb7e095d30b86ec.tar.bz2 | |
lp8788-charger: Use consumer device name on setting IIO channels
To get the ADC value for the battery voltage and temperature, LP8788 ADC
driver is used. LP8788 charger driver is the consumer of LP8788 ADC
driver. Thus, specific ADC driver name is required on getting the channel
using iio_channel_get().
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
| -rw-r--r-- | drivers/power/lp8788-charger.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/power/lp8788-charger.c b/drivers/power/lp8788-charger.c index e852d12..614e6aa 100644 --- a/drivers/power/lp8788-charger.c +++ b/drivers/power/lp8788-charger.c @@ -592,7 +592,8 @@ static void lp8788_irq_unregister(struct platform_device *pdev, } } -static void lp8788_setup_adc_channel(struct lp8788_charger *pchg) +static void lp8788_setup_adc_channel(const char *consumer_name, + struct lp8788_charger *pchg) { struct lp8788_charger_platform_data *pdata = pchg->pdata; struct device *dev = pchg->lp->dev; @@ -616,7 +617,7 @@ static void lp8788_setup_adc_channel(struct lp8788_charger *pchg) case LPADC_VBATT_5P5: case LPADC_VBATT_6P0: case LPADC_VBATT_5P0: - chan = iio_channel_get(NULL, chan_name[id]); + chan = iio_channel_get(consumer_name, chan_name[id]); pchg->chan[LP8788_VBATT] = IS_ERR(chan) ? NULL : chan; break; default: @@ -631,7 +632,7 @@ static void lp8788_setup_adc_channel(struct lp8788_charger *pchg) case LPADC_ADC2: case LPADC_ADC3: case LPADC_ADC4: - chan = iio_channel_get(NULL, chan_name[id]); + chan = iio_channel_get(consumer_name, chan_name[id]); pchg->chan[LP8788_BATT_TEMP] = IS_ERR(chan) ? NULL : chan; break; default: @@ -747,7 +748,7 @@ static __devinit int lp8788_charger_probe(struct platform_device *pdev) if (ret) return ret; - lp8788_setup_adc_channel(pchg); + lp8788_setup_adc_channel(pdev->name, pchg); ret = lp8788_psy_register(pdev, pchg); if (ret) |