| Message ID | 20170127085458.18270-20-quentin.schulz@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 27/01/17 08:54, Quentin Schulz wrote: > This maps the IIO channels batt_v, batt_chrg_i and batt_dischrg_i > (respectively exposing the current charging and discharging currents and > current voltage measures of the battery power supply) to the battery > power supply driver. > > Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Jonathan Cameron <jic23@kernel.org> > --- > > added in v2 > > drivers/iio/adc/axp20x_adc.c | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c > index 14f4ec0..64c7c75 100644 > --- a/drivers/iio/adc/axp20x_adc.c > +++ b/drivers/iio/adc/axp20x_adc.c > @@ -112,6 +112,34 @@ static struct iio_map axp20x_maps[] = { > .consumer_dev_name = "axp20x-ac-power-supply", > .consumer_channel = "acin_i", > .adc_channel_label = "acin_i", > + }, { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_v", > + .adc_channel_label = "batt_v", > + }, { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_chrg_i", > + .adc_channel_label = "batt_chrg_i", > + }, { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_dischrg_i", > + .adc_channel_label = "batt_dischrg_i", > + }, { /* sentinel */ } > +}; > + > +static struct iio_map axp22x_maps[] = { > + { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_v", > + .adc_channel_label = "batt_v", > + }, { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_chrg_i", > + .adc_channel_label = "batt_chrg_i", > + }, { > + .consumer_dev_name = "axp20x-battery-power-supply", > + .consumer_channel = "batt_dischrg_i", > + .adc_channel_label = "batt_dischrg_i", > }, { /* sentinel */ } > }; > > @@ -479,6 +507,7 @@ static const struct axp_data axp22x_data = { > .adc_en1_mask = AXP22X_ADC_EN1_MASK, > .adc_rate = axp22x_adc_rate, > .adc_en2 = false, > + .maps = axp22x_maps, > }; > > static const struct of_device_id axp20x_adc_of_match[] = { >
On Sat, Jan 28, 2017 at 10:52 PM, Jonathan Cameron <jic23@kernel.org> wrote: > On 27/01/17 08:54, Quentin Schulz wrote: >> This maps the IIO channels batt_v, batt_chrg_i and batt_dischrg_i >> (respectively exposing the current charging and discharging currents and >> current voltage measures of the battery power supply) to the battery >> power supply driver. >> >> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> > Acked-by: Jonathan Cameron <jic23@kernel.org> Acked-by: Chen-Yu Tsai <wens@csie.org>
diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c index 14f4ec0..64c7c75 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c @@ -112,6 +112,34 @@ static struct iio_map axp20x_maps[] = { .consumer_dev_name = "axp20x-ac-power-supply", .consumer_channel = "acin_i", .adc_channel_label = "acin_i", + }, { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_v", + .adc_channel_label = "batt_v", + }, { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_chrg_i", + .adc_channel_label = "batt_chrg_i", + }, { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_dischrg_i", + .adc_channel_label = "batt_dischrg_i", + }, { /* sentinel */ } +}; + +static struct iio_map axp22x_maps[] = { + { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_v", + .adc_channel_label = "batt_v", + }, { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_chrg_i", + .adc_channel_label = "batt_chrg_i", + }, { + .consumer_dev_name = "axp20x-battery-power-supply", + .consumer_channel = "batt_dischrg_i", + .adc_channel_label = "batt_dischrg_i", }, { /* sentinel */ } }; @@ -479,6 +507,7 @@ static const struct axp_data axp22x_data = { .adc_en1_mask = AXP22X_ADC_EN1_MASK, .adc_rate = axp22x_adc_rate, .adc_en2 = false, + .maps = axp22x_maps, }; static const struct of_device_id axp20x_adc_of_match[] = {
This maps the IIO channels batt_v, batt_chrg_i and batt_dischrg_i (respectively exposing the current charging and discharging currents and current voltage measures of the battery power supply) to the battery power supply driver. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> --- added in v2 drivers/iio/adc/axp20x_adc.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)