Re: [PATCH v8 4/6] iio/adc: ingenic: Retrieve channels list from soc data struct

Artur Rojek <contact@xxxxxxxxxxxxxx> · Sun, 12 Jul 2020 21:53:57 +0200

On 2020-07-12 14:11, Jonathan Cameron wrote:
On Sun, 12 Jul 2020 13:07:13 +0100
Jonathan Cameron <jic23@xxxxxxxxxx> wrote:

On Thu,  9 Jul 2020 17:21:58 +0200
Artur Rojek <contact@xxxxxxxxxxxxxx> wrote:

> From: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
>
> Instead of having one array of struct iio_chan_spec for all SoCs, and
> have some SoCs remove the last item of the array as they can't use it,
> have each SoC define its array of supported channels.
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
> Tested-by: Artur Rojek <contact@xxxxxxxxxxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing for
autobuilders to play with it.
Actually removed from tree again.

Artur, as you sent this patch on to me, you need to sign-off on it
so we maintain the DCO related records of how this got to the kernel.
You can just reply here to give it.

Signed-off-by: Artur Rojek <contact@xxxxxxxxxxxxxx>

Thanks,
Artur

Thanks,

Jonathan

Thanks,

Jonathan

> ---
>
>  Changes:
>
>  v8: new patch
>
>  drivers/iio/adc/ingenic-adc.c | 99 +++++++++++++++++++++++------------
>  1 file changed, 65 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c
> index 89019fb59d48..0233a9055c86 100644
> --- a/drivers/iio/adc/ingenic-adc.c
> +++ b/drivers/iio/adc/ingenic-adc.c
> @@ -55,6 +55,8 @@ struct ingenic_adc_soc_data {
>  	size_t battery_scale_avail_size;
>  	unsigned int battery_vref_mode: 1;
>  	unsigned int has_aux2: 1;
> +	const struct iio_chan_spec *channels;
> +	unsigned int num_channels;
>  	int (*init_clk_div)(struct device *dev, struct ingenic_adc *adc);
>  };
>
> @@ -262,6 +264,61 @@ static int jz4770_adc_init_clk_div(struct device *dev, struct ingenic_adc *adc)
>  	return 0;
>  }
>
> +static const struct iio_chan_spec jz4740_channels[] = {
> +	{
> +		.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,
> +	},
> +};
> +
> +static const struct iio_chan_spec jz4770_channels[] = {
> +	{
> +		.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 ingenic_adc_soc_data jz4725b_adc_soc_data = {
>  	.battery_high_vref = JZ4725B_ADC_BATTERY_HIGH_VREF,
>  	.battery_high_vref_bits = JZ4725B_ADC_BATTERY_HIGH_VREF_BITS,
> @@ -271,6 +328,8 @@ static const struct ingenic_adc_soc_data jz4725b_adc_soc_data = {
>  	.battery_scale_avail_size = ARRAY_SIZE(jz4725b_adc_battery_scale_avail),
>  	.battery_vref_mode = true,
>  	.has_aux2 = false,
> +	.channels = jz4740_channels,
> +	.num_channels = ARRAY_SIZE(jz4740_channels),
>  	.init_clk_div = jz4725b_adc_init_clk_div,
>  };
>
> @@ -283,6 +342,8 @@ static const struct ingenic_adc_soc_data jz4740_adc_soc_data = {
>  	.battery_scale_avail_size = ARRAY_SIZE(jz4740_adc_battery_scale_avail),
>  	.battery_vref_mode = true,
>  	.has_aux2 = false,
> +	.channels = jz4740_channels,
> +	.num_channels = ARRAY_SIZE(jz4740_channels),
>  	.init_clk_div = NULL, /* no ADCLK register on JZ4740 */
>  };
>
> @@ -295,6 +356,8 @@ static const struct ingenic_adc_soc_data jz4770_adc_soc_data = {
>  	.battery_scale_avail_size = ARRAY_SIZE(jz4770_adc_battery_scale_avail),
>  	.battery_vref_mode = false,
>  	.has_aux2 = true,
> +	.channels = jz4770_channels,
> +	.num_channels = ARRAY_SIZE(jz4770_channels),
>  	.init_clk_div = jz4770_adc_init_clk_div,
>  };
>
> @@ -427,35 +490,6 @@ static const struct iio_info ingenic_adc_info = {
>  	.of_xlate = ingenic_adc_of_xlate,
>  };
>
> -static const struct iio_chan_spec ingenic_channels[] = {
> -	{
> -		.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,
> -	},
> -	{
> -		.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,
> -	},
> -	{ /* Must always be last in the array. */
> -		.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,
> -	},
> -};
> -
>  static int ingenic_adc_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
> @@ -517,11 +551,8 @@ static int ingenic_adc_probe(struct platform_device *pdev)
>  	iio_dev->dev.parent = dev;
>  	iio_dev->name = "jz-adc";
>  	iio_dev->modes = INDIO_DIRECT_MODE;
> -	iio_dev->channels = ingenic_channels;
> -	iio_dev->num_channels = ARRAY_SIZE(ingenic_channels);
> -	/* Remove AUX2 from the list of supported channels. */
> -	if (!adc->soc_data->has_aux2)
> -		iio_dev->num_channels -= 1;
> +	iio_dev->channels = soc_data->channels;
> +	iio_dev->num_channels = soc_data->num_channels;
>  	iio_dev->info = &ingenic_adc_info;
>
>  	ret = devm_iio_device_register(dev, iio_dev);