| Message ID | 20170110234745.29691-2-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi, On Wed, Jan 11, 2017 at 12:47:39AM +0100, Linus Walleij wrote: > This switches the AB8500 battery temperature driver to using > the standard IIO ADC channel lookup and conversion routines. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-By: Sebastian Reichel <sre@kernel.org> -- Sebastian > drivers/power/supply/ab8500_btemp.c | 41 ++++++++++++++++++++++++++----------- > 1 file changed, 29 insertions(+), 12 deletions(-) > > diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c > index 6ffdc18f2599..61161db5cffa 100644 > --- a/drivers/power/supply/ab8500_btemp.c > +++ b/drivers/power/supply/ab8500_btemp.c > @@ -26,7 +26,7 @@ > #include <linux/mfd/abx500.h> > #include <linux/mfd/abx500/ab8500.h> > #include <linux/mfd/abx500/ab8500-bm.h> > -#include <linux/mfd/abx500/ab8500-gpadc.h> > +#include <linux/iio/consumer.h> > > #define VTVOUT_V 1800 > > @@ -79,7 +79,8 @@ struct ab8500_btemp_ranges { > * @bat_temp: Dispatched battery temperature in degree Celcius > * @prev_bat_temp Last measured battery temperature in degree Celcius > * @parent: Pointer to the struct ab8500 > - * @gpadc: Pointer to the struct gpadc > + * @adc_btemp_ball: ADC channel for the battery ball temperature > + * @adc_bat_ctrl: ADC channel for the battery control > * @fg: Pointer to the struct fg > * @bm: Platform specific battery management information > * @btemp_psy: Structure for BTEMP specific battery properties > @@ -96,7 +97,8 @@ struct ab8500_btemp { > int bat_temp; > int prev_bat_temp; > struct ab8500 *parent; > - struct ab8500_gpadc *gpadc; > + struct iio_channel *btemp_ball; > + struct iio_channel *bat_ctrl; > struct ab8500_fg *fg; > struct abx500_bm_data *bm; > struct power_supply *btemp_psy; > @@ -180,13 +182,13 @@ static int ab8500_btemp_batctrl_volt_to_res(struct ab8500_btemp *di, > */ > static int ab8500_btemp_read_batctrl_voltage(struct ab8500_btemp *di) > { > - int vbtemp; > + int vbtemp, ret; > static int prev; > > - vbtemp = ab8500_gpadc_convert(di->gpadc, BAT_CTRL); > - if (vbtemp < 0) { > + ret = iio_read_channel_processed(di->bat_ctrl, &vbtemp); > + if (ret < 0) { > dev_err(di->dev, > - "%s gpadc conversion failed, using previous value", > + "%s ADC conversion failed, using previous value", > __func__); > return prev; > } > @@ -501,7 +503,7 @@ static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di, > */ > static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) > { > - int temp; > + int temp, ret; > static int prev; > int rbat, rntc, vntc; > u8 id; > @@ -526,10 +528,10 @@ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) > di->bm->bat_type[id].r_to_t_tbl, > di->bm->bat_type[id].n_temp_tbl_elements, rbat); > } else { > - vntc = ab8500_gpadc_convert(di->gpadc, BTEMP_BALL); > - if (vntc < 0) { > + ret = iio_read_channel_processed(di->btemp_ball, &vntc); > + if (ret < 0) { > dev_err(di->dev, > - "%s gpadc conversion failed," > + "%s ADC conversion failed," > " using previous value\n", __func__); > return prev; > } > @@ -1085,7 +1087,22 @@ static int ab8500_btemp_probe(struct platform_device *pdev) > /* get parent data */ > di->dev = &pdev->dev; > di->parent = dev_get_drvdata(pdev->dev.parent); > - di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); > + > + /* Get ADC channels */ > + di->btemp_ball = devm_iio_channel_get(&pdev->dev, "btemp_ball"); > + if (IS_ERR(di->btemp_ball)) { > + if (PTR_ERR(di->btemp_ball) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&pdev->dev, "failed to get BTEMP BALL ADC channel\n"); > + return PTR_ERR(di->btemp_ball); > + } > + di->bat_ctrl = devm_iio_channel_get(&pdev->dev, "bat_ctrl"); > + if (IS_ERR(di->bat_ctrl)) { > + if (PTR_ERR(di->bat_ctrl) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&pdev->dev, "failed to get BAT CTRL ADC channel\n"); > + return PTR_ERR(di->bat_ctrl); > + } > > di->initialized = false; > > -- > 2.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Linus,
[auto build test ERROR on ljones-mfd/for-mfd-next]
[also build test ERROR on v4.10-rc3]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Linus-Walleij/power-supply-ab8500_btemp-convert-to-IIO-ADC/20170112-002159
base: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next
config: arm-allmodconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
drivers/built-in.o: In function `ab8500_btemp_get_batctrl_res':
>> binder.c:(.text+0x2244c0): undefined reference to `iio_read_channel_processed'
drivers/built-in.o: In function `ab8500_btemp_probe':
>> binder.c:(.text+0x224728): undefined reference to `devm_iio_channel_get'
binder.c:(.text+0x224764): undefined reference to `devm_iio_channel_get'
drivers/built-in.o: In function `ab8500_btemp_periodic_work':
binder.c:(.text+0x224db0): undefined reference to `iio_read_channel_processed'
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On 10/01/17 23:47, Linus Walleij wrote: > This switches the AB8500 battery temperature driver to using > the standard IIO ADC channel lookup and conversion routines. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> A comment inline on how I'm being useless and not getting round to cleaning up the handling of consumers in IIO to avoid the need for messing around in the deferred case... Acked-by: Jonathan Cameron <jic23@kernel.org> > --- > drivers/power/supply/ab8500_btemp.c | 41 ++++++++++++++++++++++++++----------- > 1 file changed, 29 insertions(+), 12 deletions(-) > > diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c > index 6ffdc18f2599..61161db5cffa 100644 > --- a/drivers/power/supply/ab8500_btemp.c > +++ b/drivers/power/supply/ab8500_btemp.c > @@ -26,7 +26,7 @@ > #include <linux/mfd/abx500.h> > #include <linux/mfd/abx500/ab8500.h> > #include <linux/mfd/abx500/ab8500-bm.h> > -#include <linux/mfd/abx500/ab8500-gpadc.h> > +#include <linux/iio/consumer.h> > > #define VTVOUT_V 1800 > > @@ -79,7 +79,8 @@ struct ab8500_btemp_ranges { > * @bat_temp: Dispatched battery temperature in degree Celcius > * @prev_bat_temp Last measured battery temperature in degree Celcius > * @parent: Pointer to the struct ab8500 > - * @gpadc: Pointer to the struct gpadc > + * @adc_btemp_ball: ADC channel for the battery ball temperature > + * @adc_bat_ctrl: ADC channel for the battery control > * @fg: Pointer to the struct fg > * @bm: Platform specific battery management information > * @btemp_psy: Structure for BTEMP specific battery properties > @@ -96,7 +97,8 @@ struct ab8500_btemp { > int bat_temp; > int prev_bat_temp; > struct ab8500 *parent; > - struct ab8500_gpadc *gpadc; > + struct iio_channel *btemp_ball; > + struct iio_channel *bat_ctrl; > struct ab8500_fg *fg; > struct abx500_bm_data *bm; > struct power_supply *btemp_psy; > @@ -180,13 +182,13 @@ static int ab8500_btemp_batctrl_volt_to_res(struct ab8500_btemp *di, > */ > static int ab8500_btemp_read_batctrl_voltage(struct ab8500_btemp *di) > { > - int vbtemp; > + int vbtemp, ret; > static int prev; > > - vbtemp = ab8500_gpadc_convert(di->gpadc, BAT_CTRL); > - if (vbtemp < 0) { > + ret = iio_read_channel_processed(di->bat_ctrl, &vbtemp); > + if (ret < 0) { > dev_err(di->dev, > - "%s gpadc conversion failed, using previous value", > + "%s ADC conversion failed, using previous value", > __func__); > return prev; > } > @@ -501,7 +503,7 @@ static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di, > */ > static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) > { > - int temp; > + int temp, ret; > static int prev; > int rbat, rntc, vntc; > u8 id; > @@ -526,10 +528,10 @@ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) > di->bm->bat_type[id].r_to_t_tbl, > di->bm->bat_type[id].n_temp_tbl_elements, rbat); > } else { > - vntc = ab8500_gpadc_convert(di->gpadc, BTEMP_BALL); > - if (vntc < 0) { > + ret = iio_read_channel_processed(di->btemp_ball, &vntc); > + if (ret < 0) { > dev_err(di->dev, > - "%s gpadc conversion failed," > + "%s ADC conversion failed," > " using previous value\n", __func__); > return prev; > } > @@ -1085,7 +1087,22 @@ static int ab8500_btemp_probe(struct platform_device *pdev) > /* get parent data */ > di->dev = &pdev->dev; > di->parent = dev_get_drvdata(pdev->dev.parent); > - di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); > + > + /* Get ADC channels */ > + di->btemp_ball = devm_iio_channel_get(&pdev->dev, "btemp_ball"); > + if (IS_ERR(di->btemp_ball)) { > + if (PTR_ERR(di->btemp_ball) == -ENODEV) > + return -EPROBE_DEFER; I (or someone else) still needs to look at reworking our in kernel stuff so that this sort of trickery isn't needed. Won't do any harm having this there in the meantime. > + dev_err(&pdev->dev, "failed to get BTEMP BALL ADC channel\n"); > + return PTR_ERR(di->btemp_ball); > + } > + di->bat_ctrl = devm_iio_channel_get(&pdev->dev, "bat_ctrl"); > + if (IS_ERR(di->bat_ctrl)) { > + if (PTR_ERR(di->bat_ctrl) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&pdev->dev, "failed to get BAT CTRL ADC channel\n"); > + return PTR_ERR(di->bat_ctrl); > + } > > di->initialized = false; > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c index 6ffdc18f2599..61161db5cffa 100644 --- a/drivers/power/supply/ab8500_btemp.c +++ b/drivers/power/supply/ab8500_btemp.c @@ -26,7 +26,7 @@ #include <linux/mfd/abx500.h> #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/abx500/ab8500-bm.h> -#include <linux/mfd/abx500/ab8500-gpadc.h> +#include <linux/iio/consumer.h> #define VTVOUT_V 1800 @@ -79,7 +79,8 @@ struct ab8500_btemp_ranges { * @bat_temp: Dispatched battery temperature in degree Celcius * @prev_bat_temp Last measured battery temperature in degree Celcius * @parent: Pointer to the struct ab8500 - * @gpadc: Pointer to the struct gpadc + * @adc_btemp_ball: ADC channel for the battery ball temperature + * @adc_bat_ctrl: ADC channel for the battery control * @fg: Pointer to the struct fg * @bm: Platform specific battery management information * @btemp_psy: Structure for BTEMP specific battery properties @@ -96,7 +97,8 @@ struct ab8500_btemp { int bat_temp; int prev_bat_temp; struct ab8500 *parent; - struct ab8500_gpadc *gpadc; + struct iio_channel *btemp_ball; + struct iio_channel *bat_ctrl; struct ab8500_fg *fg; struct abx500_bm_data *bm; struct power_supply *btemp_psy; @@ -180,13 +182,13 @@ static int ab8500_btemp_batctrl_volt_to_res(struct ab8500_btemp *di, */ static int ab8500_btemp_read_batctrl_voltage(struct ab8500_btemp *di) { - int vbtemp; + int vbtemp, ret; static int prev; - vbtemp = ab8500_gpadc_convert(di->gpadc, BAT_CTRL); - if (vbtemp < 0) { + ret = iio_read_channel_processed(di->bat_ctrl, &vbtemp); + if (ret < 0) { dev_err(di->dev, - "%s gpadc conversion failed, using previous value", + "%s ADC conversion failed, using previous value", __func__); return prev; } @@ -501,7 +503,7 @@ static int ab8500_btemp_res_to_temp(struct ab8500_btemp *di, */ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) { - int temp; + int temp, ret; static int prev; int rbat, rntc, vntc; u8 id; @@ -526,10 +528,10 @@ static int ab8500_btemp_measure_temp(struct ab8500_btemp *di) di->bm->bat_type[id].r_to_t_tbl, di->bm->bat_type[id].n_temp_tbl_elements, rbat); } else { - vntc = ab8500_gpadc_convert(di->gpadc, BTEMP_BALL); - if (vntc < 0) { + ret = iio_read_channel_processed(di->btemp_ball, &vntc); + if (ret < 0) { dev_err(di->dev, - "%s gpadc conversion failed," + "%s ADC conversion failed," " using previous value\n", __func__); return prev; } @@ -1085,7 +1087,22 @@ static int ab8500_btemp_probe(struct platform_device *pdev) /* get parent data */ di->dev = &pdev->dev; di->parent = dev_get_drvdata(pdev->dev.parent); - di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); + + /* Get ADC channels */ + di->btemp_ball = devm_iio_channel_get(&pdev->dev, "btemp_ball"); + if (IS_ERR(di->btemp_ball)) { + if (PTR_ERR(di->btemp_ball) == -ENODEV) + return -EPROBE_DEFER; + dev_err(&pdev->dev, "failed to get BTEMP BALL ADC channel\n"); + return PTR_ERR(di->btemp_ball); + } + di->bat_ctrl = devm_iio_channel_get(&pdev->dev, "bat_ctrl"); + if (IS_ERR(di->bat_ctrl)) { + if (PTR_ERR(di->bat_ctrl) == -ENODEV) + return -EPROBE_DEFER; + dev_err(&pdev->dev, "failed to get BAT CTRL ADC channel\n"); + return PTR_ERR(di->bat_ctrl); + } di->initialized = false;
This switches the AB8500 battery temperature driver to using the standard IIO ADC channel lookup and conversion routines. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/power/supply/ab8500_btemp.c | 41 ++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 12 deletions(-) -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html