Skip to content

Commit

Permalink
lp8788-charger: Use consumer device name on setting IIO channels
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kim, Milo authored and Anton Vorontsov committed Nov 18, 2012
1 parent 952aeeb commit 968a478
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/power/lp8788-charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 968a478

Please sign in to comment.