From: Jonathan Cameron <jic23@kernel.org> To: Billy Tsai <billy_tsai@aspeedtech.com> Cc: <lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>, <joel@jms.id.au>, <andrew@aj.id.au>, <p.zabel@pengutronix.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <BMC-SW@aspeedtech.com> Subject: Re: [v5 04/15] iio: adc: aspeed: Keep model data to driver data. Date: Sun, 5 Sep 2021 15:50:29 +0100 [thread overview] Message-ID: <20210905155029.3faa2c04@jic23-huawei> (raw) In-Reply-To: <20210905153339.751732cc@jic23-huawei> On Sun, 5 Sep 2021 15:33:39 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Tue, 31 Aug 2021 15:14:47 +0800 > Billy Tsai <billy_tsai@aspeedtech.com> wrote: > > > Keep the model data pointer to driver data for reducing the usage of > > of_device_get_match_data(). > > > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > This one starts to be impacted by the fix (as its in the context). > Rather than making a mess of things for linux-next etc I'll hold > off on these until that fix is upstream in a few weeks. > > If I seem to have lost it (it's been known to happen :( ) then > feel free to poke me! Having taken another look at the rest of the series (and Philipp's review) please do a v6 starting from this patch. Thanks, Jonathan > > Thanks, > > Jonathan > > --- > > drivers/iio/adc/aspeed_adc.c | 20 +++++++------------- > > 1 file changed, 7 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > > index f055fe7b2c40..76ae1c3f584b 100644 > > --- a/drivers/iio/adc/aspeed_adc.c > > +++ b/drivers/iio/adc/aspeed_adc.c > > @@ -77,6 +77,7 @@ struct aspeed_adc_model_data { > > > > struct aspeed_adc_data { > > struct device *dev; > > + const struct aspeed_adc_model_data *model_data; > > void __iomem *base; > > spinlock_t clk_lock; > > struct clk_hw *clk_prescaler; > > @@ -118,8 +119,6 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > > int *val, int *val2, long mask) > > { > > struct aspeed_adc_data *data = iio_priv(indio_dev); > > - const struct aspeed_adc_model_data *model_data = > > - of_device_get_match_data(data->dev); > > > > switch (mask) { > > case IIO_CHAN_INFO_RAW: > > @@ -127,7 +126,7 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > > return IIO_VAL_INT; > > > > case IIO_CHAN_INFO_SCALE: > > - *val = model_data->vref_voltage; > > + *val = data->model_data->vref_voltage; > > *val2 = ASPEED_RESOLUTION_BITS; > > return IIO_VAL_FRACTIONAL_LOG2; > > > > @@ -146,13 +145,11 @@ static int aspeed_adc_write_raw(struct iio_dev *indio_dev, > > int val, int val2, long mask) > > { > > struct aspeed_adc_data *data = iio_priv(indio_dev); > > - const struct aspeed_adc_model_data *model_data = > > - of_device_get_match_data(data->dev); > > > > switch (mask) { > > case IIO_CHAN_INFO_SAMP_FREQ: > > - if (val < model_data->min_sampling_rate || > > - val > model_data->max_sampling_rate) > > + if (val < data->model_data->min_sampling_rate || > > + val > data->model_data->max_sampling_rate) > > return -EINVAL; > > > > clk_set_rate(data->clk_scaler->clk, > > @@ -198,7 +195,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > { > > struct iio_dev *indio_dev; > > struct aspeed_adc_data *data; > > - const struct aspeed_adc_model_data *model_data; > > const char *clk_parent_name; > > int ret; > > u32 adc_engine_control_reg_val; > > @@ -209,6 +205,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > > > data = iio_priv(indio_dev); > > data->dev = &pdev->dev; > > + data->model_data = of_device_get_match_data(&pdev->dev); > > platform_set_drvdata(pdev, indio_dev); > > > > data->base = devm_platform_ioremap_resource(pdev, 0); > > @@ -249,9 +246,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > } > > reset_control_deassert(data->rst); > > > > - model_data = of_device_get_match_data(&pdev->dev); > > - > > - if (model_data->wait_init_sequence) { > > + if (data->model_data->wait_init_sequence) { > > /* Enable engine in normal mode. */ > > writel(FIELD_PREP(ASPEED_ADC_OP_MODE, > > ASPEED_ADC_OP_MODE_NORMAL) | > > @@ -281,8 +276,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > writel(adc_engine_control_reg_val, > > data->base + ASPEED_REG_ENGINE_CONTROL); > > > > - model_data = of_device_get_match_data(&pdev->dev); > > - indio_dev->name = model_data->model_name; > > + indio_dev->name = data->model_data->model_name; > > indio_dev->info = &aspeed_adc_iio_info; > > indio_dev->modes = INDIO_DIRECT_MODE; > > indio_dev->channels = aspeed_adc_iio_channels; >
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jic23@kernel.org> To: Billy Tsai <billy_tsai@aspeedtech.com> Cc: <lars@metafoo.de>, <pmeerw@pmeerw.net>, <robh+dt@kernel.org>, <joel@jms.id.au>, <andrew@aj.id.au>, <p.zabel@pengutronix.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>, <BMC-SW@aspeedtech.com> Subject: Re: [v5 04/15] iio: adc: aspeed: Keep model data to driver data. Date: Sun, 5 Sep 2021 15:50:29 +0100 [thread overview] Message-ID: <20210905155029.3faa2c04@jic23-huawei> (raw) In-Reply-To: <20210905153339.751732cc@jic23-huawei> On Sun, 5 Sep 2021 15:33:39 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Tue, 31 Aug 2021 15:14:47 +0800 > Billy Tsai <billy_tsai@aspeedtech.com> wrote: > > > Keep the model data pointer to driver data for reducing the usage of > > of_device_get_match_data(). > > > > Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com> > This one starts to be impacted by the fix (as its in the context). > Rather than making a mess of things for linux-next etc I'll hold > off on these until that fix is upstream in a few weeks. > > If I seem to have lost it (it's been known to happen :( ) then > feel free to poke me! Having taken another look at the rest of the series (and Philipp's review) please do a v6 starting from this patch. Thanks, Jonathan > > Thanks, > > Jonathan > > --- > > drivers/iio/adc/aspeed_adc.c | 20 +++++++------------- > > 1 file changed, 7 insertions(+), 13 deletions(-) > > > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > > index f055fe7b2c40..76ae1c3f584b 100644 > > --- a/drivers/iio/adc/aspeed_adc.c > > +++ b/drivers/iio/adc/aspeed_adc.c > > @@ -77,6 +77,7 @@ struct aspeed_adc_model_data { > > > > struct aspeed_adc_data { > > struct device *dev; > > + const struct aspeed_adc_model_data *model_data; > > void __iomem *base; > > spinlock_t clk_lock; > > struct clk_hw *clk_prescaler; > > @@ -118,8 +119,6 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > > int *val, int *val2, long mask) > > { > > struct aspeed_adc_data *data = iio_priv(indio_dev); > > - const struct aspeed_adc_model_data *model_data = > > - of_device_get_match_data(data->dev); > > > > switch (mask) { > > case IIO_CHAN_INFO_RAW: > > @@ -127,7 +126,7 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > > return IIO_VAL_INT; > > > > case IIO_CHAN_INFO_SCALE: > > - *val = model_data->vref_voltage; > > + *val = data->model_data->vref_voltage; > > *val2 = ASPEED_RESOLUTION_BITS; > > return IIO_VAL_FRACTIONAL_LOG2; > > > > @@ -146,13 +145,11 @@ static int aspeed_adc_write_raw(struct iio_dev *indio_dev, > > int val, int val2, long mask) > > { > > struct aspeed_adc_data *data = iio_priv(indio_dev); > > - const struct aspeed_adc_model_data *model_data = > > - of_device_get_match_data(data->dev); > > > > switch (mask) { > > case IIO_CHAN_INFO_SAMP_FREQ: > > - if (val < model_data->min_sampling_rate || > > - val > model_data->max_sampling_rate) > > + if (val < data->model_data->min_sampling_rate || > > + val > data->model_data->max_sampling_rate) > > return -EINVAL; > > > > clk_set_rate(data->clk_scaler->clk, > > @@ -198,7 +195,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > { > > struct iio_dev *indio_dev; > > struct aspeed_adc_data *data; > > - const struct aspeed_adc_model_data *model_data; > > const char *clk_parent_name; > > int ret; > > u32 adc_engine_control_reg_val; > > @@ -209,6 +205,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > > > data = iio_priv(indio_dev); > > data->dev = &pdev->dev; > > + data->model_data = of_device_get_match_data(&pdev->dev); > > platform_set_drvdata(pdev, indio_dev); > > > > data->base = devm_platform_ioremap_resource(pdev, 0); > > @@ -249,9 +246,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > } > > reset_control_deassert(data->rst); > > > > - model_data = of_device_get_match_data(&pdev->dev); > > - > > - if (model_data->wait_init_sequence) { > > + if (data->model_data->wait_init_sequence) { > > /* Enable engine in normal mode. */ > > writel(FIELD_PREP(ASPEED_ADC_OP_MODE, > > ASPEED_ADC_OP_MODE_NORMAL) | > > @@ -281,8 +276,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > writel(adc_engine_control_reg_val, > > data->base + ASPEED_REG_ENGINE_CONTROL); > > > > - model_data = of_device_get_match_data(&pdev->dev); > > - indio_dev->name = model_data->model_name; > > + indio_dev->name = data->model_data->model_name; > > indio_dev->info = &aspeed_adc_iio_info; > > indio_dev->modes = INDIO_DIRECT_MODE; > > indio_dev->channels = aspeed_adc_iio_channels; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-09-05 14:47 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-31 7:14 [v5 00/15] Add support for ast2600 ADC Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 01/15] iio: adc: aspeed: set driver data when adc probe Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-05 14:25 ` Jonathan Cameron 2021-09-05 14:25 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 02/15] dt-bindings: iio: adc: Add ast2600-adc bindings Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-01 1:38 ` Rob Herring 2021-09-01 1:38 ` Rob Herring 2021-09-05 14:27 ` Jonathan Cameron 2021-09-05 14:27 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 03/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-05 14:30 ` Jonathan Cameron 2021-09-05 14:30 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 04/15] iio: adc: aspeed: Keep model data to driver data Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-05 14:33 ` Jonathan Cameron 2021-09-05 14:33 ` Jonathan Cameron 2021-09-05 14:50 ` Jonathan Cameron [this message] 2021-09-05 14:50 ` Jonathan Cameron 2021-09-16 3:52 ` Joel Stanley 2021-09-16 3:52 ` Joel Stanley 2021-09-18 17:55 ` Jonathan Cameron 2021-09-18 17:55 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-05 14:37 ` Jonathan Cameron 2021-09-05 14:37 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 06/15] iio: adc: aspeed: Add vref config function Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 07/15] iio: adc: aspeed: Set num_channels with model data Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 08/15] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:51 ` Philipp Zabel 2021-08-31 7:51 ` Philipp Zabel 2021-08-31 7:14 ` [v5 10/15] iio: adc: aspeed: Support ast2600 adc Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 11/15] iio: adc: aspeed: Fix the calculate error of clock Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-09-05 14:47 ` Jonathan Cameron 2021-09-05 14:47 ` Jonathan Cameron 2021-08-31 7:14 ` [v5 12/15] iio: adc: aspeed: Add func to set sampling rate Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai 2021-08-31 7:14 ` Billy Tsai 2021-08-31 7:14 ` [v5 15/15] iio: adc: aspeed: Get and set trimming data Billy Tsai 2021-08-31 7:14 ` Billy Tsai
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=20210905155029.3faa2c04@jic23-huawei \ --to=jic23@kernel.org \ --cc=BMC-SW@aspeedtech.com \ --cc=andrew@aj.id.au \ --cc=billy_tsai@aspeedtech.com \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=joel@jms.id.au \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=p.zabel@pengutronix.de \ --cc=pmeerw@pmeerw.net \ --cc=robh+dt@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.