From: Guenter Roeck <linux@roeck-us.net> To: Linus Walleij <linus.walleij@linaro.org>, Lee Jones <lee.jones@linaro.org>, Jonathan Cameron <jic23@kernel.org>, linux-iio@vger.kernel.org, Sebastian Reichel <sre@kernel.org> Cc: Mboumba Cedric Madianga <cedric.madianga@gmail.com>, linux-pm@vger.kernel.org, linux-hwmon@vger.kernel.org Subject: Re: [PATCH 4/7] hwmon: ab8500: convert to IIO ADC Date: Wed, 11 Jan 2017 17:40:06 -0800 [thread overview] Message-ID: <4d7c4364-3c09-5bd0-b073-651e31df5741@roeck-us.net> (raw) In-Reply-To: <20170110234745.29691-5-linus.walleij@linaro.org> On 01/10/2017 03:47 PM, Linus Walleij wrote: > This switches the AB8500 hardware monitor driver to using > the standard IIO ADC channel lookup and conversion routines. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- (cautious) Acked-by: Guenter Roeck <linux@roeck-us.net> Looks ok to me, but someone with better understanding of iio should probably have a closer look. Guenter > drivers/hwmon/ab8500.c | 65 +++++++++++++++++++++++++++++++------------------- > 1 file changed, 41 insertions(+), 24 deletions(-) > > diff --git a/drivers/hwmon/ab8500.c b/drivers/hwmon/ab8500.c > index 8b6a4f4c8774..6f4a5534bdcb 100644 > --- a/drivers/hwmon/ab8500.c > +++ b/drivers/hwmon/ab8500.c > @@ -17,20 +17,24 @@ > #include <linux/hwmon-sysfs.h> > #include <linux/mfd/abx500.h> > #include <linux/mfd/abx500/ab8500-bm.h> > -#include <linux/mfd/abx500/ab8500-gpadc.h> > #include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/power/ab8500.h> > #include <linux/reboot.h> > #include <linux/slab.h> > #include <linux/sysfs.h> > +#include <linux/iio/consumer.h> > #include "abx500.h" > > #define DEFAULT_POWER_OFF_DELAY (HZ * 10) > #define THERMAL_VCC 1800 > #define PULL_UP_RESISTOR 47000 > -/* Number of monitored sensors should not greater than NUM_SENSORS */ > -#define NUM_MONITORED_SENSORS 4 > + > +#define AB8500_SENSOR_AUX1 0 > +#define AB8500_SENSOR_AUX2 1 > +#define AB8500_SENSOR_BTEMP_BALL 2 > +#define AB8500_SENSOR_BAT_CTRL 3 > +#define NUM_MONITORED_SENSORS 4 > > struct ab8500_gpadc_cfg { > const struct abx500_res_to_temp *temp_tbl; > @@ -40,7 +44,8 @@ struct ab8500_gpadc_cfg { > }; > > struct ab8500_temp { > - struct ab8500_gpadc *gpadc; > + struct iio_channel *aux1; > + struct iio_channel *aux2; > struct ab8500_btemp *btemp; > struct delayed_work power_off_work; > struct ab8500_gpadc_cfg cfg; > @@ -82,15 +87,21 @@ static int ab8500_read_sensor(struct abx500_temp *data, u8 sensor, int *temp) > int voltage, ret; > struct ab8500_temp *ab8500_data = data->plat_data; > > - if (sensor == BAT_CTRL) { > - *temp = ab8500_btemp_get_batctrl_temp(ab8500_data->btemp); > - } else if (sensor == BTEMP_BALL) { > + if (sensor == AB8500_SENSOR_BTEMP_BALL) { > *temp = ab8500_btemp_get_temp(ab8500_data->btemp); > - } else { > - voltage = ab8500_gpadc_convert(ab8500_data->gpadc, sensor); > - if (voltage < 0) > - return voltage; > - > + } else if (sensor == AB8500_SENSOR_BAT_CTRL) { > + *temp = ab8500_btemp_get_batctrl_temp(ab8500_data->btemp); > + } else if (sensor == AB8500_SENSOR_AUX1) { > + ret = iio_read_channel_processed(ab8500_data->aux1, &voltage); > + if (ret < 0) > + return ret; > + ret = ab8500_voltage_to_temp(&ab8500_data->cfg, voltage, temp); > + if (ret < 0) > + return ret; > + } else if (sensor == AB8500_SENSOR_AUX2) { > + ret = iio_read_channel_processed(ab8500_data->aux2, &voltage); > + if (ret < 0) > + return ret; > ret = ab8500_voltage_to_temp(&ab8500_data->cfg, voltage, temp); > if (ret < 0) > return ret; > @@ -164,10 +175,6 @@ int abx500_hwmon_init(struct abx500_temp *data) > if (!ab8500_data) > return -ENOMEM; > > - ab8500_data->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); > - if (IS_ERR(ab8500_data->gpadc)) > - return PTR_ERR(ab8500_data->gpadc); > - > ab8500_data->btemp = ab8500_btemp_get(); > if (IS_ERR(ab8500_data->btemp)) > return PTR_ERR(ab8500_data->btemp); > @@ -181,15 +188,25 @@ int abx500_hwmon_init(struct abx500_temp *data) > ab8500_data->cfg.tbl_sz = ab8500_temp_tbl_a_size; > > data->plat_data = ab8500_data; > + ab8500_data->aux1 = devm_iio_channel_get(&data->pdev->dev, "aux1"); > + if (IS_ERR(ab8500_data->aux1)) { > + if (PTR_ERR(ab8500_data->aux1) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&data->pdev->dev, "failed to get AUX1 ADC channel\n"); > + return PTR_ERR(ab8500_data->aux1); > + } > + ab8500_data->aux2 = devm_iio_channel_get(&data->pdev->dev, "aux2"); > + if (IS_ERR(ab8500_data->aux2)) { > + if (PTR_ERR(ab8500_data->aux2) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&data->pdev->dev, "failed to get AUX2 ADC channel\n"); > + return PTR_ERR(ab8500_data->aux2); > + } > > - /* > - * ADC_AUX1 and ADC_AUX2, connected to external NTC > - * BTEMP_BALL and BAT_CTRL, fixed usage > - */ > - data->gpadc_addr[0] = ADC_AUX1; > - data->gpadc_addr[1] = ADC_AUX2; > - data->gpadc_addr[2] = BTEMP_BALL; > - data->gpadc_addr[3] = BAT_CTRL; > + data->gpadc_addr[0] = AB8500_SENSOR_AUX1; > + data->gpadc_addr[1] = AB8500_SENSOR_AUX2; > + data->gpadc_addr[2] = AB8500_SENSOR_BTEMP_BALL; > + data->gpadc_addr[3] = AB8500_SENSOR_BAT_CTRL; > data->monitored_sensors = NUM_MONITORED_SENSORS; > > data->ops.read_sensor = ab8500_read_sensor; >
WARNING: multiple messages have this Message-ID (diff)
From: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> To: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Mboumba Cedric Madianga <cedric.madianga-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-hwmon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Re: [PATCH 4/7] hwmon: ab8500: convert to IIO ADC Date: Wed, 11 Jan 2017 17:40:06 -0800 [thread overview] Message-ID: <4d7c4364-3c09-5bd0-b073-651e31df5741@roeck-us.net> (raw) In-Reply-To: <20170110234745.29691-5-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> On 01/10/2017 03:47 PM, Linus Walleij wrote: > This switches the AB8500 hardware monitor driver to using > the standard IIO ADC channel lookup and conversion routines. > > Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > --- (cautious) Acked-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org> Looks ok to me, but someone with better understanding of iio should probably have a closer look. Guenter > drivers/hwmon/ab8500.c | 65 +++++++++++++++++++++++++++++++------------------- > 1 file changed, 41 insertions(+), 24 deletions(-) > > diff --git a/drivers/hwmon/ab8500.c b/drivers/hwmon/ab8500.c > index 8b6a4f4c8774..6f4a5534bdcb 100644 > --- a/drivers/hwmon/ab8500.c > +++ b/drivers/hwmon/ab8500.c > @@ -17,20 +17,24 @@ > #include <linux/hwmon-sysfs.h> > #include <linux/mfd/abx500.h> > #include <linux/mfd/abx500/ab8500-bm.h> > -#include <linux/mfd/abx500/ab8500-gpadc.h> > #include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/power/ab8500.h> > #include <linux/reboot.h> > #include <linux/slab.h> > #include <linux/sysfs.h> > +#include <linux/iio/consumer.h> > #include "abx500.h" > > #define DEFAULT_POWER_OFF_DELAY (HZ * 10) > #define THERMAL_VCC 1800 > #define PULL_UP_RESISTOR 47000 > -/* Number of monitored sensors should not greater than NUM_SENSORS */ > -#define NUM_MONITORED_SENSORS 4 > + > +#define AB8500_SENSOR_AUX1 0 > +#define AB8500_SENSOR_AUX2 1 > +#define AB8500_SENSOR_BTEMP_BALL 2 > +#define AB8500_SENSOR_BAT_CTRL 3 > +#define NUM_MONITORED_SENSORS 4 > > struct ab8500_gpadc_cfg { > const struct abx500_res_to_temp *temp_tbl; > @@ -40,7 +44,8 @@ struct ab8500_gpadc_cfg { > }; > > struct ab8500_temp { > - struct ab8500_gpadc *gpadc; > + struct iio_channel *aux1; > + struct iio_channel *aux2; > struct ab8500_btemp *btemp; > struct delayed_work power_off_work; > struct ab8500_gpadc_cfg cfg; > @@ -82,15 +87,21 @@ static int ab8500_read_sensor(struct abx500_temp *data, u8 sensor, int *temp) > int voltage, ret; > struct ab8500_temp *ab8500_data = data->plat_data; > > - if (sensor == BAT_CTRL) { > - *temp = ab8500_btemp_get_batctrl_temp(ab8500_data->btemp); > - } else if (sensor == BTEMP_BALL) { > + if (sensor == AB8500_SENSOR_BTEMP_BALL) { > *temp = ab8500_btemp_get_temp(ab8500_data->btemp); > - } else { > - voltage = ab8500_gpadc_convert(ab8500_data->gpadc, sensor); > - if (voltage < 0) > - return voltage; > - > + } else if (sensor == AB8500_SENSOR_BAT_CTRL) { > + *temp = ab8500_btemp_get_batctrl_temp(ab8500_data->btemp); > + } else if (sensor == AB8500_SENSOR_AUX1) { > + ret = iio_read_channel_processed(ab8500_data->aux1, &voltage); > + if (ret < 0) > + return ret; > + ret = ab8500_voltage_to_temp(&ab8500_data->cfg, voltage, temp); > + if (ret < 0) > + return ret; > + } else if (sensor == AB8500_SENSOR_AUX2) { > + ret = iio_read_channel_processed(ab8500_data->aux2, &voltage); > + if (ret < 0) > + return ret; > ret = ab8500_voltage_to_temp(&ab8500_data->cfg, voltage, temp); > if (ret < 0) > return ret; > @@ -164,10 +175,6 @@ int abx500_hwmon_init(struct abx500_temp *data) > if (!ab8500_data) > return -ENOMEM; > > - ab8500_data->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); > - if (IS_ERR(ab8500_data->gpadc)) > - return PTR_ERR(ab8500_data->gpadc); > - > ab8500_data->btemp = ab8500_btemp_get(); > if (IS_ERR(ab8500_data->btemp)) > return PTR_ERR(ab8500_data->btemp); > @@ -181,15 +188,25 @@ int abx500_hwmon_init(struct abx500_temp *data) > ab8500_data->cfg.tbl_sz = ab8500_temp_tbl_a_size; > > data->plat_data = ab8500_data; > + ab8500_data->aux1 = devm_iio_channel_get(&data->pdev->dev, "aux1"); > + if (IS_ERR(ab8500_data->aux1)) { > + if (PTR_ERR(ab8500_data->aux1) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&data->pdev->dev, "failed to get AUX1 ADC channel\n"); > + return PTR_ERR(ab8500_data->aux1); > + } > + ab8500_data->aux2 = devm_iio_channel_get(&data->pdev->dev, "aux2"); > + if (IS_ERR(ab8500_data->aux2)) { > + if (PTR_ERR(ab8500_data->aux2) == -ENODEV) > + return -EPROBE_DEFER; > + dev_err(&data->pdev->dev, "failed to get AUX2 ADC channel\n"); > + return PTR_ERR(ab8500_data->aux2); > + } > > - /* > - * ADC_AUX1 and ADC_AUX2, connected to external NTC > - * BTEMP_BALL and BAT_CTRL, fixed usage > - */ > - data->gpadc_addr[0] = ADC_AUX1; > - data->gpadc_addr[1] = ADC_AUX2; > - data->gpadc_addr[2] = BTEMP_BALL; > - data->gpadc_addr[3] = BAT_CTRL; > + data->gpadc_addr[0] = AB8500_SENSOR_AUX1; > + data->gpadc_addr[1] = AB8500_SENSOR_AUX2; > + data->gpadc_addr[2] = AB8500_SENSOR_BTEMP_BALL; > + data->gpadc_addr[3] = AB8500_SENSOR_BAT_CTRL; > data->monitored_sensors = NUM_MONITORED_SENSORS; > > data->ops.read_sensor = ab8500_read_sensor; >
next prev parent reply other threads:[~2017-01-12 1:40 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-10 23:47 [PATCH 0/7] mfd/iio: move the AB8500 GPADC driver to IIO Linus Walleij 2017-01-10 23:47 ` Linus Walleij 2017-01-10 23:47 ` [PATCH 1/7] power: supply: ab8500_btemp: convert to IIO ADC Linus Walleij 2017-01-10 23:47 ` Linus Walleij 2017-01-12 3:02 ` Sebastian Reichel 2017-01-12 3:02 ` Sebastian Reichel 2017-01-12 6:13 ` kbuild test robot 2017-01-12 6:13 ` kbuild test robot 2017-01-14 14:54 ` Jonathan Cameron 2017-01-14 14:54 ` Jonathan Cameron 2017-01-10 23:47 ` [PATCH 2/7] power: supply: ab8500_charger: " Linus Walleij 2017-01-12 3:03 ` Sebastian Reichel 2017-01-14 14:56 ` Jonathan Cameron 2017-01-10 23:47 ` [PATCH 3/7] power: supply: ab8500_fg: " Linus Walleij 2017-01-12 3:03 ` Sebastian Reichel 2017-01-14 14:58 ` Jonathan Cameron 2017-01-10 23:47 ` [PATCH 4/7] hwmon: ab8500: " Linus Walleij 2017-01-12 1:40 ` Guenter Roeck [this message] 2017-01-12 1:40 ` Guenter Roeck 2017-01-14 15:00 ` Jonathan Cameron 2017-01-14 15:00 ` Jonathan Cameron 2017-01-10 23:47 ` [PATCH 5/7] mfd: ab8500: augment DT bindings Linus Walleij 2017-01-10 23:47 ` Linus Walleij 2017-01-13 14:55 ` Lee Jones 2017-01-10 23:47 ` [PATCH 6/7] mfd/iio: move the AB8500 GPADC to IIO Linus Walleij 2017-01-13 14:56 ` Lee Jones 2017-01-13 14:56 ` Lee Jones 2017-01-14 15:57 ` Jonathan Cameron 2017-01-10 23:47 ` [PATCH 7/7] ARM: dts: ux500: declare GPADC IIO ADC channels Linus Walleij 2017-01-12 3:04 ` [PATCH 0/7] mfd/iio: move the AB8500 GPADC driver to IIO Sebastian Reichel 2017-01-14 14:48 ` Jonathan Cameron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4d7c4364-3c09-5bd0-b073-651e31df5741@roeck-us.net \ --to=linux@roeck-us.net \ --cc=cedric.madianga@gmail.com \ --cc=jic23@kernel.org \ --cc=lee.jones@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-hwmon@vger.kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=sre@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.