From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D53C2C433DF for ; Sun, 12 Jul 2020 12:07:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AAA4020720 for ; Sun, 12 Jul 2020 12:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594555639; bh=1iw1Dx24gPSPr1aZowmGq5zrKpxdW1ObdyBQES4IMwY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=zBfZj2MpOnPe50bFfgUJ8Z4DhzsGnFRVirFCFGT9gVPAw2E/fH5Wnr+p95AJWLu3m gwgZdYNrSAOP5SviDEn6pWnRnYwYeTtVc/WELsyzMvZMDAi2nUr2dtErNHATKLvblL tdeKNxEyKVTf9JWD1DoYPcSVI0GdJ3emeSU11a/U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725765AbgGLMHT (ORCPT ); Sun, 12 Jul 2020 08:07:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:51204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728339AbgGLMHS (ORCPT ); Sun, 12 Jul 2020 08:07:18 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F35E20672; Sun, 12 Jul 2020 12:07:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594555638; bh=1iw1Dx24gPSPr1aZowmGq5zrKpxdW1ObdyBQES4IMwY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UZ89flOjL6Fo0OS4Q98PF2tQqMCeloGQJPIl6n6wnbWoDajP/5EdL7ZiEWD9sNwP+ ynyI1raMENuhjIw46znRR9LeQ1GB2l25gP9eQS2nAq/MVVknyFHBasHQUCkP303Oyu hxJokxLIky4cK/x0ww4MWPbTzVmbzZrU9GWsf02I= Date: Sun, 12 Jul 2020 13:07:13 +0100 From: Jonathan Cameron To: Artur Rojek Cc: Dmitry Torokhov , Rob Herring , Mark Rutland , Paul Cercueil , Andy Shevchenko , Heiko Stuebner , Ezequiel Garcia , devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v8 4/6] iio/adc: ingenic: Retrieve channels list from soc data struct Message-ID: <20200712130713.64cd2bac@archlinux> In-Reply-To: <20200709152200.10039-5-contact@artur-rojek.eu> References: <20200709152200.10039-1-contact@artur-rojek.eu> <20200709152200.10039-5-contact@artur-rojek.eu> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Thu, 9 Jul 2020 17:21:58 +0200 Artur Rojek wrote: > From: Paul Cercueil > > 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 > Tested-by: Artur Rojek Applied to the togreg branch of iio.git and pushed out as testing for autobuilders to play with it. 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);