| Message ID | 20210721105317.36742-4-cbranchereau@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] iio/adc: ingenic: rename has_aux2 to has_aux_md | expand |
Hello Paul, thank you for all the feedback, duly noted I will V2, there is just one I disagree with: On Wed, Jul 21, 2021 at 8:15 PM Paul Cercueil <paul@crapouillou.net> wrote: > > Hi Christophe, > > Le mer., juil. 21 2021 at 12:53:14 +0200, citral23 > <cbranchereau@gmail.com> a écrit : > > Signed-off-by: citral23 <cbranchereau@gmail.com> > > --- > > drivers/iio/adc/ingenic-adc.c | 64 > > +++++++++++++++++++++++++++++++++++ > > 1 file changed, 64 insertions(+) > > > > diff --git a/drivers/iio/adc/ingenic-adc.c > > b/drivers/iio/adc/ingenic-adc.c > > index 40f2d8c2cf72..285e7aa8e37a 100644 > > --- a/drivers/iio/adc/ingenic-adc.c > > +++ b/drivers/iio/adc/ingenic-adc.c > > @@ -71,6 +71,7 @@ > > #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS 10 > > #define JZ4740_ADC_BATTERY_HIGH_VREF (7500 * 0.986) > > #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS 12 > > +#define JZ4760_ADC_BATTERY_VREF 2500 > > #define JZ4770_ADC_BATTERY_VREF 1200 > > #define JZ4770_ADC_BATTERY_VREF_BITS 12 > > > > @@ -295,6 +296,10 @@ static const int > > jz4740_adc_battery_scale_avail[] = { > > JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS, > > }; > > > > +static const int jz4760_adc_battery_scale_avail[] = { > > + JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS, > > +}; > > + > > static const int jz4770_adc_battery_raw_avail[] = { > > 0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1, > > }; > > @@ -339,6 +344,8 @@ static int jz4725b_adc_init_clk_div(struct device > > *dev, struct ingenic_adc *adc) > > return 0; > > } > > > > + > > + > > Unrelated cosmetic change - remove it. This is not cosmetic, but to add a VREF of 2.5V for the jz4760, as per specs > > > static int jz4770_adc_init_clk_div(struct device *dev, struct > > ingenic_adc *adc) > > { > > struct clk *parent_clk; > > @@ -400,6 +407,47 @@ static const struct iio_chan_spec > > jz4740_channels[] = { > > }, > > }; > > > > +static const struct iio_chan_spec jz4760_channels[] = { > > + { > > + .extend_name = "aux0", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX0, > > + .scan_index = -1, > > + }, > > + { > > + .extend_name = "aux", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX, > > + .scan_index = -1, > > + }, > > A couple of things. First, ".extend_name" is deprecated now... But > since the driver used it before, I suppose it doesn't make sense to use > labels just for this SoC (as we can't remove .extend_name for other > SoCs because of ABI). So I suppose it works here, but maybe Jonathan > disagrees. > > Also, you should probably use "aux1" as the channel's name instead of > "aux", independently of the macro name you used in the .channel field. > > > + { > > + .extend_name = "battery", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .info_mask_separate_available = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_BATTERY, > > + .scan_index = -1, > > + }, > > Swap the battery channel at the end, no? First the three AUX then the > battery channel? > > The rest looks pretty good to me. > > Cheers, > -Paul > > > + { > > + .extend_name = "aux2", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX2, > > + .scan_index = -1, > > + }, > > +}; > > + > > static const struct iio_chan_spec jz4770_channels[] = { > > { > > .type = IIO_VOLTAGE, > > @@ -526,6 +574,20 @@ static const struct ingenic_adc_soc_data > > jz4740_adc_soc_data = { > > .init_clk_div = NULL, /* no ADCLK register on JZ4740 */ > > }; > > > > +static const struct ingenic_adc_soc_data jz4760_adc_soc_data = { > > + .battery_high_vref = JZ4760_ADC_BATTERY_VREF, > > + .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, > > + .battery_raw_avail = jz4770_adc_battery_raw_avail, > > + .battery_raw_avail_size = ARRAY_SIZE(jz4770_adc_battery_raw_avail), > > + .battery_scale_avail = jz4760_adc_battery_scale_avail, > > + .battery_scale_avail_size = > > ARRAY_SIZE(jz4760_adc_battery_scale_avail), > > + .battery_vref_mode = false, > > + .has_aux_md = true, > > + .channels = jz4760_channels, > > + .num_channels = ARRAY_SIZE(jz4760_channels), > > + .init_clk_div = jz4770_adc_init_clk_div, > > +}; > > + > > static const struct ingenic_adc_soc_data jz4770_adc_soc_data = { > > .battery_high_vref = JZ4770_ADC_BATTERY_VREF, > > .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, > > @@ -621,6 +683,7 @@ static int ingenic_adc_read_raw(struct iio_dev > > *iio_dev, > > return ingenic_adc_read_chan_info_raw(iio_dev, chan, val); > > case IIO_CHAN_INFO_SCALE: > > switch (chan->channel) { > > + case INGENIC_ADC_AUX0: > > case INGENIC_ADC_AUX: > > case INGENIC_ADC_AUX2: > > *val = JZ_ADC_AUX_VREF; > > @@ -832,6 +895,7 @@ static int ingenic_adc_probe(struct > > platform_device *pdev) > > static const struct of_device_id ingenic_adc_of_match[] = { > > { .compatible = "ingenic,jz4725b-adc", .data = > > &jz4725b_adc_soc_data, }, > > { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, > > }, > > + { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, > > }, > > { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, > > }, > > { }, > > }; > > -- > > 2.30.2 > > > > KR CB
On 7/21/21 10:09 PM, Christophe Branchereau wrote: > Hello Paul, thank you for all the feedback, duly noted I will V2, > there is just one I disagree with: > > On Wed, Jul 21, 2021 at 8:15 PM Paul Cercueil <paul@crapouillou.net> wrote: >> >> Hi Christophe, >> >> Le mer., juil. 21 2021 at 12:53:14 +0200, citral23 >> <cbranchereau@gmail.com> a écrit : >>> Signed-off-by: citral23 <cbranchereau@gmail.com> >>> --- >>> drivers/iio/adc/ingenic-adc.c | 64 >>> +++++++++++++++++++++++++++++++++++ >>> 1 file changed, 64 insertions(+) >>> >>> diff --git a/drivers/iio/adc/ingenic-adc.c >>> b/drivers/iio/adc/ingenic-adc.c >>> index 40f2d8c2cf72..285e7aa8e37a 100644 >>> --- a/drivers/iio/adc/ingenic-adc.c >>> +++ b/drivers/iio/adc/ingenic-adc.c >>> @@ -71,6 +71,7 @@ >>> #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS 10 >>> #define JZ4740_ADC_BATTERY_HIGH_VREF (7500 * 0.986) >>> #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS 12 >>> +#define JZ4760_ADC_BATTERY_VREF 2500 >>> #define JZ4770_ADC_BATTERY_VREF 1200 >>> #define JZ4770_ADC_BATTERY_VREF_BITS 12 >>> >>> @@ -295,6 +296,10 @@ static const int >>> jz4740_adc_battery_scale_avail[] = { >>> JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS, >>> }; >>> >>> +static const int jz4760_adc_battery_scale_avail[] = { >>> + JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS, >>> +}; >>> + >>> static const int jz4770_adc_battery_raw_avail[] = { >>> 0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1, >>> }; >>> @@ -339,6 +344,8 @@ static int jz4725b_adc_init_clk_div(struct device >>> *dev, struct ingenic_adc *adc) >>> return 0; >>> } >>> >>> + >>> + >> >> Unrelated cosmetic change - remove it. > > This is not cosmetic, but to add a VREF of 2.5V for the jz4760, as per specs > Two added empty lines are not cosmetic ? Guenter >> >>> static int jz4770_adc_init_clk_div(struct device *dev, struct >>> ingenic_adc *adc) >>> { >>> struct clk *parent_clk; >>> @@ -400,6 +407,47 @@ static const struct iio_chan_spec >>> jz4740_channels[] = { >>> }, >>> }; >>> >>> +static const struct iio_chan_spec jz4760_channels[] = { >>> + { >>> + .extend_name = "aux0", >>> + .type = IIO_VOLTAGE, >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | >>> + BIT(IIO_CHAN_INFO_SCALE), >>> + .indexed = 1, >>> + .channel = INGENIC_ADC_AUX0, >>> + .scan_index = -1, >>> + }, >>> + { >>> + .extend_name = "aux", >>> + .type = IIO_VOLTAGE, >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | >>> + BIT(IIO_CHAN_INFO_SCALE), >>> + .indexed = 1, >>> + .channel = INGENIC_ADC_AUX, >>> + .scan_index = -1, >>> + }, >> >> A couple of things. First, ".extend_name" is deprecated now... But >> since the driver used it before, I suppose it doesn't make sense to use >> labels just for this SoC (as we can't remove .extend_name for other >> SoCs because of ABI). So I suppose it works here, but maybe Jonathan >> disagrees. >> >> Also, you should probably use "aux1" as the channel's name instead of >> "aux", independently of the macro name you used in the .channel field. >> >>> + { >>> + .extend_name = "battery", >>> + .type = IIO_VOLTAGE, >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | >>> + BIT(IIO_CHAN_INFO_SCALE), >>> + .info_mask_separate_available = BIT(IIO_CHAN_INFO_RAW) | >>> + BIT(IIO_CHAN_INFO_SCALE), >>> + .indexed = 1, >>> + .channel = INGENIC_ADC_BATTERY, >>> + .scan_index = -1, >>> + }, >> >> Swap the battery channel at the end, no? First the three AUX then the >> battery channel? >> >> The rest looks pretty good to me. >> >> Cheers, >> -Paul >> >>> + { >>> + .extend_name = "aux2", >>> + .type = IIO_VOLTAGE, >>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | >>> + BIT(IIO_CHAN_INFO_SCALE), >>> + .indexed = 1, >>> + .channel = INGENIC_ADC_AUX2, >>> + .scan_index = -1, >>> + }, >>> +}; >>> + >>> static const struct iio_chan_spec jz4770_channels[] = { >>> { >>> .type = IIO_VOLTAGE, >>> @@ -526,6 +574,20 @@ static const struct ingenic_adc_soc_data >>> jz4740_adc_soc_data = { >>> .init_clk_div = NULL, /* no ADCLK register on JZ4740 */ >>> }; >>> >>> +static const struct ingenic_adc_soc_data jz4760_adc_soc_data = { >>> + .battery_high_vref = JZ4760_ADC_BATTERY_VREF, >>> + .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, >>> + .battery_raw_avail = jz4770_adc_battery_raw_avail, >>> + .battery_raw_avail_size = ARRAY_SIZE(jz4770_adc_battery_raw_avail), >>> + .battery_scale_avail = jz4760_adc_battery_scale_avail, >>> + .battery_scale_avail_size = >>> ARRAY_SIZE(jz4760_adc_battery_scale_avail), >>> + .battery_vref_mode = false, >>> + .has_aux_md = true, >>> + .channels = jz4760_channels, >>> + .num_channels = ARRAY_SIZE(jz4760_channels), >>> + .init_clk_div = jz4770_adc_init_clk_div, >>> +}; >>> + >>> static const struct ingenic_adc_soc_data jz4770_adc_soc_data = { >>> .battery_high_vref = JZ4770_ADC_BATTERY_VREF, >>> .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, >>> @@ -621,6 +683,7 @@ static int ingenic_adc_read_raw(struct iio_dev >>> *iio_dev, >>> return ingenic_adc_read_chan_info_raw(iio_dev, chan, val); >>> case IIO_CHAN_INFO_SCALE: >>> switch (chan->channel) { >>> + case INGENIC_ADC_AUX0: >>> case INGENIC_ADC_AUX: >>> case INGENIC_ADC_AUX2: >>> *val = JZ_ADC_AUX_VREF; >>> @@ -832,6 +895,7 @@ static int ingenic_adc_probe(struct >>> platform_device *pdev) >>> static const struct of_device_id ingenic_adc_of_match[] = { >>> { .compatible = "ingenic,jz4725b-adc", .data = >>> &jz4725b_adc_soc_data, }, >>> { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, >>> }, >>> + { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, >>> }, >>> { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, >>> }, >>> { }, >>> }; >>> -- >>> 2.30.2 >>> >> >> > KR > CB >
On Fri, 23 Jul 2021 10:58:08 +0200 Christophe Branchereau <cbranchereau@gmail.com> wrote: > This is a set of patches to add support to the JZ4760(B) socs found in numerous gaming handhelds and some > mp3 players. Process note. Please don't set the reply to for new revisions. They nest deep inside threads when people read email that way and it makes them hard to spot. I'd much rather see them as a new thread related only by the naming. Thanks, Jonathan > > Christophe Branchereau (5): > iio/adc: ingenic: rename has_aux2 to has_aux_md > dt-bindings: iio/adc: add an INGENIC_ADC_AUX0 entry > iio/adc: ingenic: add JZ4760 support to the sadc driver > iio/adc: ingenic: add JZ4760B support to the sadc driver > dt-bindings: iio/adc: ingenic: add the JZ4760(B) socs to the sadc > Documentation >
On Wed, 21 Jul 2021 19:15:47 +0100 Paul Cercueil <paul@crapouillou.net> wrote: > Hi Christophe, > > Le mer., juil. 21 2021 at 12:53:14 +0200, citral23 > <cbranchereau@gmail.com> a écrit : > > Signed-off-by: citral23 <cbranchereau@gmail.com> > > --- > > drivers/iio/adc/ingenic-adc.c | 64 > > +++++++++++++++++++++++++++++++++++ > > 1 file changed, 64 insertions(+) > > > > diff --git a/drivers/iio/adc/ingenic-adc.c > > b/drivers/iio/adc/ingenic-adc.c > > index 40f2d8c2cf72..285e7aa8e37a 100644 > > --- a/drivers/iio/adc/ingenic-adc.c > > +++ b/drivers/iio/adc/ingenic-adc.c > > @@ -71,6 +71,7 @@ > > #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS 10 > > #define JZ4740_ADC_BATTERY_HIGH_VREF (7500 * 0.986) > > #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS 12 > > +#define JZ4760_ADC_BATTERY_VREF 2500 > > #define JZ4770_ADC_BATTERY_VREF 1200 > > #define JZ4770_ADC_BATTERY_VREF_BITS 12 > > > > @@ -295,6 +296,10 @@ static const int > > jz4740_adc_battery_scale_avail[] = { > > JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS, > > }; > > > > +static const int jz4760_adc_battery_scale_avail[] = { > > + JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS, > > +}; > > + > > static const int jz4770_adc_battery_raw_avail[] = { > > 0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1, > > }; > > @@ -339,6 +344,8 @@ static int jz4725b_adc_init_clk_div(struct device > > *dev, struct ingenic_adc *adc) > > return 0; > > } > > > > + > > + > > Unrelated cosmetic change - remove it. > > > static int jz4770_adc_init_clk_div(struct device *dev, struct > > ingenic_adc *adc) > > { > > struct clk *parent_clk; > > @@ -400,6 +407,47 @@ static const struct iio_chan_spec > > jz4740_channels[] = { > > }, > > }; > > > > +static const struct iio_chan_spec jz4760_channels[] = { > > + { > > + .extend_name = "aux0", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX0, > > + .scan_index = -1, > > + }, > > + { > > + .extend_name = "aux", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX, > > + .scan_index = -1, > > + }, > > A couple of things. First, ".extend_name" is deprecated now... But > since the driver used it before, I suppose it doesn't make sense to use > labels just for this SoC (as we can't remove .extend_name for other > SoCs because of ABI). So I suppose it works here, but maybe Jonathan > disagrees. Hmm. Interesting question. We could attempt to force new device support added to older drivers not to use extend_name but it seems likely in this case at least, that the same board specific code might run on this devices and the others, so I'll make an exception. I'd be less keen if this was a stand alone ADC, Jonathan > > Also, you should probably use "aux1" as the channel's name instead of > "aux", independently of the macro name you used in the .channel field. > > > + { > > + .extend_name = "battery", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .info_mask_separate_available = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_BATTERY, > > + .scan_index = -1, > > + }, > > Swap the battery channel at the end, no? First the three AUX then the > battery channel? > > The rest looks pretty good to me. > > Cheers, > -Paul > > > + { > > + .extend_name = "aux2", > > + .type = IIO_VOLTAGE, > > + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | > > + BIT(IIO_CHAN_INFO_SCALE), > > + .indexed = 1, > > + .channel = INGENIC_ADC_AUX2, > > + .scan_index = -1, > > + }, > > +}; > > + > > static const struct iio_chan_spec jz4770_channels[] = { > > { > > .type = IIO_VOLTAGE, > > @@ -526,6 +574,20 @@ static const struct ingenic_adc_soc_data > > jz4740_adc_soc_data = { > > .init_clk_div = NULL, /* no ADCLK register on JZ4740 */ > > }; > > > > +static const struct ingenic_adc_soc_data jz4760_adc_soc_data = { > > + .battery_high_vref = JZ4760_ADC_BATTERY_VREF, > > + .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, > > + .battery_raw_avail = jz4770_adc_battery_raw_avail, > > + .battery_raw_avail_size = ARRAY_SIZE(jz4770_adc_battery_raw_avail), > > + .battery_scale_avail = jz4760_adc_battery_scale_avail, > > + .battery_scale_avail_size = > > ARRAY_SIZE(jz4760_adc_battery_scale_avail), > > + .battery_vref_mode = false, > > + .has_aux_md = true, > > + .channels = jz4760_channels, > > + .num_channels = ARRAY_SIZE(jz4760_channels), > > + .init_clk_div = jz4770_adc_init_clk_div, > > +}; > > + > > static const struct ingenic_adc_soc_data jz4770_adc_soc_data = { > > .battery_high_vref = JZ4770_ADC_BATTERY_VREF, > > .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, > > @@ -621,6 +683,7 @@ static int ingenic_adc_read_raw(struct iio_dev > > *iio_dev, > > return ingenic_adc_read_chan_info_raw(iio_dev, chan, val); > > case IIO_CHAN_INFO_SCALE: > > switch (chan->channel) { > > + case INGENIC_ADC_AUX0: > > case INGENIC_ADC_AUX: > > case INGENIC_ADC_AUX2: > > *val = JZ_ADC_AUX_VREF; > > @@ -832,6 +895,7 @@ static int ingenic_adc_probe(struct > > platform_device *pdev) > > static const struct of_device_id ingenic_adc_of_match[] = { > > { .compatible = "ingenic,jz4725b-adc", .data = > > &jz4725b_adc_soc_data, }, > > { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, > > }, > > + { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, > > }, > > { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, > > }, > > { }, > > }; > > -- > > 2.30.2 > > > >
On Fri, 23 Jul 2021 10:58:12 +0200 Christophe Branchereau <cbranchereau@gmail.com> wrote: > The JZ4760B variant differs slightly from the JZ4760: it has a bit called > VBAT_SEL in the CFG register. > > In order to correctly sample the battery voltage on existing handhelds > using this SOC, the bit must be cleared. > > We leave the possibility to set the bit, by adding the > "ingenic,use-internal-divider" property to a devicetree. > > Signed-off-by: Christophe Branchereau <cbranchereau@gmail.com> One minor formatting comment inline. If that is all that comes up in review I can just change it whilst applying. Jonathan > --- > drivers/iio/adc/ingenic-adc.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c > index 6b9af0530590..09937c05d2af 100644 > --- a/drivers/iio/adc/ingenic-adc.c > +++ b/drivers/iio/adc/ingenic-adc.c > @@ -37,6 +37,7 @@ > #define JZ_ADC_REG_CFG_SAMPLE_NUM(n) ((n) << 10) > #define JZ_ADC_REG_CFG_PULL_UP(n) ((n) << 16) > #define JZ_ADC_REG_CFG_CMD_SEL BIT(22) > +#define JZ_ADC_REG_CFG_VBAT_SEL BIT(30) > #define JZ_ADC_REG_CFG_TOUCH_OPS_MASK (BIT(31) | GENMASK(23, 10)) > #define JZ_ADC_REG_ADCLK_CLKDIV_LSB 0 > #define JZ4725B_ADC_REG_ADCLK_CLKDIV10US_LSB 16 > @@ -879,6 +880,12 @@ static int ingenic_adc_probe(struct platform_device *pdev) > /* Put hardware in a known passive state. */ > writeb(0x00, adc->base + JZ_ADC_REG_ENABLE); > writeb(0xff, adc->base + JZ_ADC_REG_CTRL); > + > + if (device_property_present(dev, "ingenic,use-internal-divider")) /* JZ4760B specific */ > + ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_VBAT_SEL, JZ_ADC_REG_CFG_VBAT_SEL); Please break this line and move the comment on the one above. Whilst we have relaxed the kernel style to allow longer lines, it's nice to still keep them to the 80 char limit when it doesn't really hurt readability. Here I don't think it would make much difference. > + else > + ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_VBAT_SEL, 0); > + > usleep_range(2000, 3000); /* Must wait at least 2ms. */ > clk_disable(adc->clk); > > @@ -906,6 +913,7 @@ static const struct of_device_id ingenic_adc_of_match[] = { > { .compatible = "ingenic,jz4725b-adc", .data = &jz4725b_adc_soc_data, }, > { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, }, > { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, }, > + { .compatible = "ingenic,jz4760b-adc", .data = &jz4760_adc_soc_data, }, > { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, }, > { }, > };
On Fri, 23 Jul 2021 10:58:13 +0200 Christophe Branchereau <cbranchereau@gmail.com> wrote: > The jz4760b variant differs slightly from the jz4760, add a property to > let users sample the internal divider if needed and document it. > > Signed-off-by: Christophe Branchereau <cbranchereau@gmail.com> > --- > .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > index 433a3fb55a2e..0dc42959a64f 100644 > --- a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > +++ b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > @@ -23,6 +23,8 @@ properties: > enum: > - ingenic,jz4725b-adc > - ingenic,jz4740-adc > + - ingenic,jz4760-adc > + - ingenic,jz4760b-adc > - ingenic,jz4770-adc > > '#io-channel-cells': > @@ -43,6 +45,13 @@ properties: > interrupts: > maxItems: 1 > > + ingenic,use-internal-divider: > + description: > + This property can be used to set VBAT_SEL in the JZ4760B CFG register > + to sample the battery voltage from the internal divider. If absent, it > + will sample the external divider. > + type: boolean > + See reply to the v1 patch for hint on how to 'enforce' that this only exists for the jz4760b Thanks, Jonathan > required: > - compatible > - '#io-channel-cells'
Hello Johnathan, am I allowed to declare the property within the if
block like this?
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
# Copyright 2019-2020 Artur Rojek
%YAML 1.2
---
$id: "http://devicetree.org/schemas/iio/adc/ingenic,adc.yaml#"
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Ingenic JZ47xx ADC controller IIO bindings
maintainers:
- Artur Rojek <contact@artur-rojek.eu>
description: >
Industrial I/O subsystem bindings for ADC controller found in
Ingenic JZ47xx SoCs.
ADC clients must use the format described in
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml,
giving a phandle and IIO specifier pair ("io-channels") to the ADC controller.
properties:
compatible:
enum:
- ingenic,jz4725b-adc
- ingenic,jz4740-adc
- ingenic,jz4760-adc
- ingenic,jz4760b-adc
- ingenic,jz4770-adc
'#io-channel-cells':
const: 1
description:
Must be set to <1> to indicate channels are selected by index.
reg:
maxItems: 1
clocks:
maxItems: 1
clock-names:
items:
- const: adc
interrupts:
maxItems: 1
allOf:
- if:
properties:
compatible:
contains:
enum:
- ingenic,jz4760b-adc
then:
properties:
ingenic,use-internal-divider:
description:
If present, battery voltage is read from the VBAT_IR pin, which has an
internal 1/4 divider. If absent, it is read through the VBAT_ER pin,
which does not have such a divider.
type: boolean
required:
- compatible
- '#io-channel-cells'
- reg
- clocks
- clock-names
- interrupts
additionalProperties: false
examples:
- |
#include <dt-bindings/clock/jz4740-cgu.h>
#include <dt-bindings/iio/adc/ingenic,adc.h>
adc@10070000 {
compatible = "ingenic,jz4740-adc";
#io-channel-cells = <1>;
reg = <0x10070000 0x30>;
clocks = <&cgu JZ4740_CLK_ADC>;
clock-names = "adc";
interrupt-parent = <&intc>;
interrupts = <18>;
};
On Fri, Jul 23, 2021 at 6:17 PM Jonathan Cameron
<Jonathan.Cameron@huawei.com> wrote:
>
> On Fri, 23 Jul 2021 10:58:13 +0200
> Christophe Branchereau <cbranchereau@gmail.com> wrote:
>
> > The jz4760b variant differs slightly from the jz4760, add a property to
> > let users sample the internal divider if needed and document it.
> >
> > Signed-off-by: Christophe Branchereau <cbranchereau@gmail.com>
> > ---
> > .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
> > index 433a3fb55a2e..0dc42959a64f 100644
> > --- a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
> > +++ b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml
> > @@ -23,6 +23,8 @@ properties:
> > enum:
> > - ingenic,jz4725b-adc
> > - ingenic,jz4740-adc
> > + - ingenic,jz4760-adc
> > + - ingenic,jz4760b-adc
> > - ingenic,jz4770-adc
> >
> > '#io-channel-cells':
> > @@ -43,6 +45,13 @@ properties:
> > interrupts:
> > maxItems: 1
> >
> > + ingenic,use-internal-divider:
> > + description:
> > + This property can be used to set VBAT_SEL in the JZ4760B CFG register
> > + to sample the battery voltage from the internal divider. If absent, it
> > + will sample the external divider.
> > + type: boolean
> > +
> See reply to the v1 patch for hint on how to 'enforce' that this
> only exists for the jz4760b
>
> Thanks,
>
> Jonathan
>
> > required:
> > - compatible
> > - '#io-channel-cells'
>
On Sat, 24 Jul 2021 09:33:46 +0200 Christophe Branchereau <cbranchereau@gmail.com> wrote: > Hello Johnathan, am I allowed to declare the property within the if > block like this? Test it... Short answer is no you aren't. As someone explained it to me the other day, each layer of the yaml is checked independently so if you declare a property in the if block and not the outer layer the additionalProperties check will fail should it be present. So declare it outside, then set it false for the cases where it's not valid. Jonathan > > # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > # Copyright 2019-2020 Artur Rojek > %YAML 1.2 > --- > $id: "http://devicetree.org/schemas/iio/adc/ingenic,adc.yaml#" > $schema: "http://devicetree.org/meta-schemas/core.yaml#" > > title: Ingenic JZ47xx ADC controller IIO bindings > > maintainers: > - Artur Rojek <contact@artur-rojek.eu> > > description: > > Industrial I/O subsystem bindings for ADC controller found in > Ingenic JZ47xx SoCs. > > ADC clients must use the format described in > https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml, > giving a phandle and IIO specifier pair ("io-channels") to the ADC controller. > > properties: > compatible: > enum: > - ingenic,jz4725b-adc > - ingenic,jz4740-adc > - ingenic,jz4760-adc > - ingenic,jz4760b-adc > - ingenic,jz4770-adc > > '#io-channel-cells': > const: 1 > description: > Must be set to <1> to indicate channels are selected by index. > > reg: > maxItems: 1 > > clocks: > maxItems: 1 > > clock-names: > items: > - const: adc > > interrupts: > maxItems: 1 > > allOf: > - if: > properties: > compatible: > contains: > enum: > - ingenic,jz4760b-adc > then: > properties: > ingenic,use-internal-divider: > description: > If present, battery voltage is read from the VBAT_IR pin, which has an > internal 1/4 divider. If absent, it is read through the VBAT_ER pin, > which does not have such a divider. > type: boolean > > required: > - compatible > - '#io-channel-cells' > - reg > - clocks > - clock-names > - interrupts > > additionalProperties: false > > examples: > - | > #include <dt-bindings/clock/jz4740-cgu.h> > #include <dt-bindings/iio/adc/ingenic,adc.h> > > adc@10070000 { > compatible = "ingenic,jz4740-adc"; > #io-channel-cells = <1>; > > reg = <0x10070000 0x30>; > > clocks = <&cgu JZ4740_CLK_ADC>; > clock-names = "adc"; > > interrupt-parent = <&intc>; > interrupts = <18>; > }; > > On Fri, Jul 23, 2021 at 6:17 PM Jonathan Cameron > <Jonathan.Cameron@huawei.com> wrote: > > > > On Fri, 23 Jul 2021 10:58:13 +0200 > > Christophe Branchereau <cbranchereau@gmail.com> wrote: > > > > > The jz4760b variant differs slightly from the jz4760, add a property to > > > let users sample the internal divider if needed and document it. > > > > > > Signed-off-by: Christophe Branchereau <cbranchereau@gmail.com> > > > --- > > > .../devicetree/bindings/iio/adc/ingenic,adc.yaml | 9 +++++++++ > > > 1 file changed, 9 insertions(+) > > > > > > diff --git a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > > > index 433a3fb55a2e..0dc42959a64f 100644 > > > --- a/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > > > +++ b/Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml > > > @@ -23,6 +23,8 @@ properties: > > > enum: > > > - ingenic,jz4725b-adc > > > - ingenic,jz4740-adc > > > + - ingenic,jz4760-adc > > > + - ingenic,jz4760b-adc > > > - ingenic,jz4770-adc > > > > > > '#io-channel-cells': > > > @@ -43,6 +45,13 @@ properties: > > > interrupts: > > > maxItems: 1 > > > > > > + ingenic,use-internal-divider: > > > + description: > > > + This property can be used to set VBAT_SEL in the JZ4760B CFG register > > > + to sample the battery voltage from the internal divider. If absent, it > > > + will sample the external divider. > > > + type: boolean > > > + > > See reply to the v1 patch for hint on how to 'enforce' that this > > only exists for the jz4760b > > > > Thanks, > > > > Jonathan > > > > > required: > > > - compatible > > > - '#io-channel-cells' > >
diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c index 40f2d8c2cf72..285e7aa8e37a 100644 --- a/drivers/iio/adc/ingenic-adc.c +++ b/drivers/iio/adc/ingenic-adc.c @@ -71,6 +71,7 @@ #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS 10 #define JZ4740_ADC_BATTERY_HIGH_VREF (7500 * 0.986) #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS 12 +#define JZ4760_ADC_BATTERY_VREF 2500 #define JZ4770_ADC_BATTERY_VREF 1200 #define JZ4770_ADC_BATTERY_VREF_BITS 12 @@ -295,6 +296,10 @@ static const int jz4740_adc_battery_scale_avail[] = { JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS, }; +static const int jz4760_adc_battery_scale_avail[] = { + JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS, +}; + static const int jz4770_adc_battery_raw_avail[] = { 0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1, }; @@ -339,6 +344,8 @@ static int jz4725b_adc_init_clk_div(struct device *dev, struct ingenic_adc *adc) return 0; } + + static int jz4770_adc_init_clk_div(struct device *dev, struct ingenic_adc *adc) { struct clk *parent_clk; @@ -400,6 +407,47 @@ static const struct iio_chan_spec jz4740_channels[] = { }, }; +static const struct iio_chan_spec jz4760_channels[] = { + { + .extend_name = "aux0", + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, + .channel = INGENIC_ADC_AUX0, + .scan_index = -1, + }, + { + .extend_name = "aux", + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, + .channel = INGENIC_ADC_AUX, + .scan_index = -1, + }, + { + .extend_name = "battery", + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, + .channel = INGENIC_ADC_BATTERY, + .scan_index = -1, + }, + { + .extend_name = "aux2", + .type = IIO_VOLTAGE, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .indexed = 1, + .channel = INGENIC_ADC_AUX2, + .scan_index = -1, + }, +}; + static const struct iio_chan_spec jz4770_channels[] = { { .type = IIO_VOLTAGE, @@ -526,6 +574,20 @@ static const struct ingenic_adc_soc_data jz4740_adc_soc_data = { .init_clk_div = NULL, /* no ADCLK register on JZ4740 */ }; +static const struct ingenic_adc_soc_data jz4760_adc_soc_data = { + .battery_high_vref = JZ4760_ADC_BATTERY_VREF, + .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, + .battery_raw_avail = jz4770_adc_battery_raw_avail, + .battery_raw_avail_size = ARRAY_SIZE(jz4770_adc_battery_raw_avail), + .battery_scale_avail = jz4760_adc_battery_scale_avail, + .battery_scale_avail_size = ARRAY_SIZE(jz4760_adc_battery_scale_avail), + .battery_vref_mode = false, + .has_aux_md = true, + .channels = jz4760_channels, + .num_channels = ARRAY_SIZE(jz4760_channels), + .init_clk_div = jz4770_adc_init_clk_div, +}; + static const struct ingenic_adc_soc_data jz4770_adc_soc_data = { .battery_high_vref = JZ4770_ADC_BATTERY_VREF, .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS, @@ -621,6 +683,7 @@ static int ingenic_adc_read_raw(struct iio_dev *iio_dev, return ingenic_adc_read_chan_info_raw(iio_dev, chan, val); case IIO_CHAN_INFO_SCALE: switch (chan->channel) { + case INGENIC_ADC_AUX0: case INGENIC_ADC_AUX: case INGENIC_ADC_AUX2: *val = JZ_ADC_AUX_VREF; @@ -832,6 +895,7 @@ static int ingenic_adc_probe(struct platform_device *pdev) static const struct of_device_id ingenic_adc_of_match[] = { { .compatible = "ingenic,jz4725b-adc", .data = &jz4725b_adc_soc_data, }, { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, }, + { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, }, { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, }, { }, };
Signed-off-by: citral23 <cbranchereau@gmail.com> --- drivers/iio/adc/ingenic-adc.c | 64 +++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)