* [PATCH 0/3] meson-saradc: small code improvements
@ 2018-09-22 22:20 ` Martin Blumenstingl
0 siblings, 0 replies; 14+ messages in thread
From: Martin Blumenstingl @ 2018-09-22 22:20 UTC (permalink / raw)
To: linus-amlogic
The goal of this series is to simplify the code a bit.
This is a first preparation step for adding support for the temperature
sensor on the 32-bit Meson8, Meson8b and Meson8m2 SoCs later.
Martin Blumenstingl (3):
iio: adc: meson-saradc: remove #define
MESON_SAR_ADC_DELTA_10_TS_C_SHIFT
iio: adc: meson-saradc: use of_device_get_match_data
iio: adc: meson-saradc: simplify access to meson_sar_adc_param
drivers/iio/adc/meson_saradc.c | 37 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 19 deletions(-)
--
2.19.0
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 0/3] meson-saradc: small code improvements @ 2018-09-22 22:20 ` Martin Blumenstingl 0 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:20 UTC (permalink / raw) To: linux-amlogic, linux-iio Cc: jic23, knaack.h, lars, pmeerw, Martin Blumenstingl The goal of this series is to simplify the code a bit. This is a first preparation step for adding support for the temperature sensor on the 32-bit Meson8, Meson8b and Meson8m2 SoCs later. Martin Blumenstingl (3): iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT iio: adc: meson-saradc: use of_device_get_match_data iio: adc: meson-saradc: simplify access to meson_sar_adc_param drivers/iio/adc/meson_saradc.c | 37 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) -- 2.19.0 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 2018-09-22 22:20 ` Martin Blumenstingl @ 2018-09-22 22:21 ` Martin Blumenstingl -1 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linus-amlogic This define is of no use because the driver is avoiding shifting bits by itself but using FIELD_GET/FIELD_PREP (which are using bit masks) instead. There is already a MESON_SAR_ADC_DELTA_10_TS_C_MASK bit mask so MESON_SAR_ADC_DELTA_10_TS_C_SHIFT was redundant. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index da2d16dfa63e..b97b06bf7713 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -148,7 +148,6 @@ #define MESON_SAR_ADC_DELTA_10_TS_REVE1 BIT(26) #define MESON_SAR_ADC_DELTA_10_CHAN1_DELTA_VALUE_MASK GENMASK(25, 16) #define MESON_SAR_ADC_DELTA_10_TS_REVE0 BIT(15) - #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 11 #define MESON_SAR_ADC_DELTA_10_TS_C_MASK GENMASK(14, 11) #define MESON_SAR_ADC_DELTA_10_TS_VBG_EN BIT(10) #define MESON_SAR_ADC_DELTA_10_CHAN0_DELTA_VALUE_MASK GENMASK(9, 0) -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT @ 2018-09-22 22:21 ` Martin Blumenstingl 0 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linux-amlogic, linux-iio Cc: jic23, knaack.h, lars, pmeerw, Martin Blumenstingl This define is of no use because the driver is avoiding shifting bits by itself but using FIELD_GET/FIELD_PREP (which are using bit masks) instead. There is already a MESON_SAR_ADC_DELTA_10_TS_C_MASK bit mask so MESON_SAR_ADC_DELTA_10_TS_C_SHIFT was redundant. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index da2d16dfa63e..b97b06bf7713 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -148,7 +148,6 @@ #define MESON_SAR_ADC_DELTA_10_TS_REVE1 BIT(26) #define MESON_SAR_ADC_DELTA_10_CHAN1_DELTA_VALUE_MASK GENMASK(25, 16) #define MESON_SAR_ADC_DELTA_10_TS_REVE0 BIT(15) - #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 11 #define MESON_SAR_ADC_DELTA_10_TS_C_MASK GENMASK(14, 11) #define MESON_SAR_ADC_DELTA_10_TS_VBG_EN BIT(10) #define MESON_SAR_ADC_DELTA_10_CHAN0_DELTA_VALUE_MASK GENMASK(9, 0) -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 2018-09-22 22:21 ` Martin Blumenstingl @ 2018-09-24 20:13 ` Jonathan Cameron -1 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:13 UTC (permalink / raw) To: linus-amlogic On Sun, 23 Sep 2018 00:21:00 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > This define is of no use because the driver is avoiding shifting bits > by itself but using FIELD_GET/FIELD_PREP (which are using bit masks) > instead. There is already a MESON_SAR_ADC_DELTA_10_TS_C_MASK bit mask so > MESON_SAR_ADC_DELTA_10_TS_C_SHIFT was redundant. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index da2d16dfa63e..b97b06bf7713 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -148,7 +148,6 @@ > #define MESON_SAR_ADC_DELTA_10_TS_REVE1 BIT(26) > #define MESON_SAR_ADC_DELTA_10_CHAN1_DELTA_VALUE_MASK GENMASK(25, 16) > #define MESON_SAR_ADC_DELTA_10_TS_REVE0 BIT(15) > - #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 11 > #define MESON_SAR_ADC_DELTA_10_TS_C_MASK GENMASK(14, 11) > #define MESON_SAR_ADC_DELTA_10_TS_VBG_EN BIT(10) > #define MESON_SAR_ADC_DELTA_10_CHAN0_DELTA_VALUE_MASK GENMASK(9, 0) ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT @ 2018-09-24 20:13 ` Jonathan Cameron 0 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:13 UTC (permalink / raw) To: Martin Blumenstingl; +Cc: linux-amlogic, linux-iio, knaack.h, lars, pmeerw On Sun, 23 Sep 2018 00:21:00 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > This define is of no use because the driver is avoiding shifting bits > by itself but using FIELD_GET/FIELD_PREP (which are using bit masks) > instead. There is already a MESON_SAR_ADC_DELTA_10_TS_C_MASK bit mask so > MESON_SAR_ADC_DELTA_10_TS_C_SHIFT was redundant. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index da2d16dfa63e..b97b06bf7713 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -148,7 +148,6 @@ > #define MESON_SAR_ADC_DELTA_10_TS_REVE1 BIT(26) > #define MESON_SAR_ADC_DELTA_10_CHAN1_DELTA_VALUE_MASK GENMASK(25, 16) > #define MESON_SAR_ADC_DELTA_10_TS_REVE0 BIT(15) > - #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT 11 > #define MESON_SAR_ADC_DELTA_10_TS_C_MASK GENMASK(14, 11) > #define MESON_SAR_ADC_DELTA_10_TS_VBG_EN BIT(10) > #define MESON_SAR_ADC_DELTA_10_CHAN0_DELTA_VALUE_MASK GENMASK(9, 0) ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data 2018-09-22 22:20 ` Martin Blumenstingl @ 2018-09-22 22:21 ` Martin Blumenstingl -1 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linus-amlogic This simplifies our _probe function by using of_device_get_match_data instead of open-coding it. No functional changes. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index b97b06bf7713..9d8f2139debc 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match); static int meson_sar_adc_probe(struct platform_device *pdev) { + const struct meson_sar_adc_data *match_data; struct meson_sar_adc_priv *priv; struct iio_dev *indio_dev; struct resource *res; void __iomem *base; - const struct of_device_id *match; int irq, ret; indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); @@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev) priv = iio_priv(indio_dev); init_completion(&priv->done); - match = of_match_device(meson_sar_adc_of_match, &pdev->dev); - if (!match) { - dev_err(&pdev->dev, "failed to match device\n"); + match_data = of_device_get_match_data(&pdev->dev); + if (!match_data) { + dev_err(&pdev->dev, "failed to get match data\n"); return -ENODEV; } - priv->data = match->data; + priv->data = match_data; indio_dev->name = priv->data->name; indio_dev->dev.parent = &pdev->dev; -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data @ 2018-09-22 22:21 ` Martin Blumenstingl 0 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linux-amlogic, linux-iio Cc: jic23, knaack.h, lars, pmeerw, Martin Blumenstingl This simplifies our _probe function by using of_device_get_match_data instead of open-coding it. No functional changes. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index b97b06bf7713..9d8f2139debc 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match); static int meson_sar_adc_probe(struct platform_device *pdev) { + const struct meson_sar_adc_data *match_data; struct meson_sar_adc_priv *priv; struct iio_dev *indio_dev; struct resource *res; void __iomem *base; - const struct of_device_id *match; int irq, ret; indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); @@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev) priv = iio_priv(indio_dev); init_completion(&priv->done); - match = of_match_device(meson_sar_adc_of_match, &pdev->dev); - if (!match) { - dev_err(&pdev->dev, "failed to match device\n"); + match_data = of_device_get_match_data(&pdev->dev); + if (!match_data) { + dev_err(&pdev->dev, "failed to get match data\n"); return -ENODEV; } - priv->data = match->data; + priv->data = match_data; indio_dev->name = priv->data->name; indio_dev->dev.parent = &pdev->dev; -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data 2018-09-22 22:21 ` Martin Blumenstingl @ 2018-09-24 20:15 ` Jonathan Cameron -1 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:15 UTC (permalink / raw) To: linus-amlogic On Sun, 23 Sep 2018 00:21:01 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > This simplifies our _probe function by using of_device_get_match_data > instead of open-coding it. No functional changes. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index b97b06bf7713..9d8f2139debc 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match); > > static int meson_sar_adc_probe(struct platform_device *pdev) > { > + const struct meson_sar_adc_data *match_data; > struct meson_sar_adc_priv *priv; > struct iio_dev *indio_dev; > struct resource *res; > void __iomem *base; > - const struct of_device_id *match; > int irq, ret; > > indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > @@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > priv = iio_priv(indio_dev); > init_completion(&priv->done); > > - match = of_match_device(meson_sar_adc_of_match, &pdev->dev); > - if (!match) { > - dev_err(&pdev->dev, "failed to match device\n"); > + match_data = of_device_get_match_data(&pdev->dev); > + if (!match_data) { > + dev_err(&pdev->dev, "failed to get match data\n"); > return -ENODEV; > } > > - priv->data = match->data; > + priv->data = match_data; > > indio_dev->name = priv->data->name; > indio_dev->dev.parent = &pdev->dev; ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data @ 2018-09-24 20:15 ` Jonathan Cameron 0 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:15 UTC (permalink / raw) To: Martin Blumenstingl; +Cc: linux-amlogic, linux-iio, knaack.h, lars, pmeerw On Sun, 23 Sep 2018 00:21:01 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > This simplifies our _probe function by using of_device_get_match_data > instead of open-coding it. No functional changes. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index b97b06bf7713..9d8f2139debc 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match); > > static int meson_sar_adc_probe(struct platform_device *pdev) > { > + const struct meson_sar_adc_data *match_data; > struct meson_sar_adc_priv *priv; > struct iio_dev *indio_dev; > struct resource *res; > void __iomem *base; > - const struct of_device_id *match; > int irq, ret; > > indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); > @@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > priv = iio_priv(indio_dev); > init_completion(&priv->done); > > - match = of_match_device(meson_sar_adc_of_match, &pdev->dev); > - if (!match) { > - dev_err(&pdev->dev, "failed to match device\n"); > + match_data = of_device_get_match_data(&pdev->dev); > + if (!match_data) { > + dev_err(&pdev->dev, "failed to get match data\n"); > return -ENODEV; > } > > - priv->data = match->data; > + priv->data = match_data; > > indio_dev->name = priv->data->name; > indio_dev->dev.parent = &pdev->dev; ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param 2018-09-22 22:20 ` Martin Blumenstingl @ 2018-09-22 22:21 ` Martin Blumenstingl -1 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linus-amlogic Commit 053ffe3c8cfe31 ("iio: adc: meson-saradc: squash and share the common adc platform data") put all the data which is needed at runtime from struct meson_sar_adc_data to a new struct meson_sar_adc_param so we can re-use the platform specific configuration without having to duplicate everything just to change the name. The only place where struct meson_sar_adc_data is now needed is the _probe function which has to pass the name to the iio_dev. All other functions only need access to struct meson_sar_adc_param. This means we can simplify struct meson_sar_adc_priv. The goal of this patch is to make the code a bit easier to read since this removes one level of nesting. No functional changes intended. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 9d8f2139debc..1c4ba83c0725 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -234,7 +234,7 @@ struct meson_sar_adc_data { struct meson_sar_adc_priv { struct regmap *regmap; struct regulator *vref; - const struct meson_sar_adc_data *data; + const struct meson_sar_adc_param *param; struct clk *clkin; struct clk *core_clk; struct clk *adc_sel_clk; @@ -279,7 +279,7 @@ static int meson_sar_adc_calib_val(struct iio_dev *indio_dev, int val) /* use val_calib = scale * val_raw + offset calibration function */ tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias; - return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1); + return clamp(tmp, 0, (1 << priv->param->resolution) - 1); } static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) @@ -331,7 +331,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, } fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval); - fifo_val &= GENMASK(priv->data->param->resolution - 1, 0); + fifo_val &= GENMASK(priv->param->resolution - 1, 0); *val = meson_sar_adc_calib_val(indio_dev, fifo_val); return 0; @@ -450,7 +450,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev) mutex_lock(&indio_dev->mlock); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* prevent BL30 from using the SAR ADC while we are using it */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, @@ -478,7 +478,7 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - if (priv->data->param->has_bl30_integration) + if (priv->param->has_bl30_integration) /* allow BL30 to use the SAR ADC again */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0); @@ -562,7 +562,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev, } *val = ret / 1000; - *val2 = priv->data->param->resolution; + *val2 = priv->param->resolution; return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_CALIBBIAS: @@ -635,7 +635,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) */ meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* * leave sampling delay and the input clocks as configured by * BL30 to make sure BL30 gets the values it expects when @@ -715,7 +715,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) return ret; } - ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate); + ret = clk_set_rate(priv->adc_clk, priv->param->clock_rate); if (ret) { dev_err(indio_dev->dev.parent, "failed to set adc clock rate\n"); @@ -728,7 +728,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - const struct meson_sar_adc_param *param = priv->data->param; + const struct meson_sar_adc_param *param = priv->param; u32 enable_mask; if (param->bandgap_reg == MESON_SAR_ADC_REG11) @@ -848,8 +848,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) int ret, nominal0, nominal1, value0, value1; /* use points 25% and 75% for calibration */ - nominal0 = (1 << priv->data->param->resolution) / 4; - nominal1 = (1 << priv->data->param->resolution) * 3 / 4; + nominal0 = (1 << priv->param->resolution) / 4; + nominal1 = (1 << priv->param->resolution) * 3 / 4; meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); usleep_range(10, 20); @@ -1000,9 +1000,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return -ENODEV; } - priv->data = match_data; + priv->param = match_data->param; - indio_dev->name = priv->data->name; + indio_dev->name = match_data->name; indio_dev->dev.parent = &pdev->dev; indio_dev->dev.of_node = pdev->dev.of_node; indio_dev->modes = INDIO_DIRECT_MODE; @@ -1026,7 +1026,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return ret; priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, - priv->data->param->regmap_config); + priv->param->regmap_config); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param @ 2018-09-22 22:21 ` Martin Blumenstingl 0 siblings, 0 replies; 14+ messages in thread From: Martin Blumenstingl @ 2018-09-22 22:21 UTC (permalink / raw) To: linux-amlogic, linux-iio Cc: jic23, knaack.h, lars, pmeerw, Martin Blumenstingl Commit 053ffe3c8cfe31 ("iio: adc: meson-saradc: squash and share the common adc platform data") put all the data which is needed at runtime from struct meson_sar_adc_data to a new struct meson_sar_adc_param so we can re-use the platform specific configuration without having to duplicate everything just to change the name. The only place where struct meson_sar_adc_data is now needed is the _probe function which has to pass the name to the iio_dev. All other functions only need access to struct meson_sar_adc_param. This means we can simplify struct meson_sar_adc_priv. The goal of this patch is to make the code a bit easier to read since this removes one level of nesting. No functional changes intended. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/iio/adc/meson_saradc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 9d8f2139debc..1c4ba83c0725 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -234,7 +234,7 @@ struct meson_sar_adc_data { struct meson_sar_adc_priv { struct regmap *regmap; struct regulator *vref; - const struct meson_sar_adc_data *data; + const struct meson_sar_adc_param *param; struct clk *clkin; struct clk *core_clk; struct clk *adc_sel_clk; @@ -279,7 +279,7 @@ static int meson_sar_adc_calib_val(struct iio_dev *indio_dev, int val) /* use val_calib = scale * val_raw + offset calibration function */ tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias; - return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1); + return clamp(tmp, 0, (1 << priv->param->resolution) - 1); } static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) @@ -331,7 +331,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, } fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval); - fifo_val &= GENMASK(priv->data->param->resolution - 1, 0); + fifo_val &= GENMASK(priv->param->resolution - 1, 0); *val = meson_sar_adc_calib_val(indio_dev, fifo_val); return 0; @@ -450,7 +450,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev) mutex_lock(&indio_dev->mlock); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* prevent BL30 from using the SAR ADC while we are using it */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, @@ -478,7 +478,7 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - if (priv->data->param->has_bl30_integration) + if (priv->param->has_bl30_integration) /* allow BL30 to use the SAR ADC again */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0); @@ -562,7 +562,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev, } *val = ret / 1000; - *val2 = priv->data->param->resolution; + *val2 = priv->param->resolution; return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_CALIBBIAS: @@ -635,7 +635,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) */ meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT); - if (priv->data->param->has_bl30_integration) { + if (priv->param->has_bl30_integration) { /* * leave sampling delay and the input clocks as configured by * BL30 to make sure BL30 gets the values it expects when @@ -715,7 +715,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) return ret; } - ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate); + ret = clk_set_rate(priv->adc_clk, priv->param->clock_rate); if (ret) { dev_err(indio_dev->dev.parent, "failed to set adc clock rate\n"); @@ -728,7 +728,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - const struct meson_sar_adc_param *param = priv->data->param; + const struct meson_sar_adc_param *param = priv->param; u32 enable_mask; if (param->bandgap_reg == MESON_SAR_ADC_REG11) @@ -848,8 +848,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) int ret, nominal0, nominal1, value0, value1; /* use points 25% and 75% for calibration */ - nominal0 = (1 << priv->data->param->resolution) / 4; - nominal1 = (1 << priv->data->param->resolution) * 3 / 4; + nominal0 = (1 << priv->param->resolution) / 4; + nominal1 = (1 << priv->param->resolution) * 3 / 4; meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); usleep_range(10, 20); @@ -1000,9 +1000,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return -ENODEV; } - priv->data = match_data; + priv->param = match_data->param; - indio_dev->name = priv->data->name; + indio_dev->name = match_data->name; indio_dev->dev.parent = &pdev->dev; indio_dev->dev.of_node = pdev->dev.of_node; indio_dev->modes = INDIO_DIRECT_MODE; @@ -1026,7 +1026,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev) return ret; priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, - priv->data->param->regmap_config); + priv->param->regmap_config); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); -- 2.19.0 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param 2018-09-22 22:21 ` Martin Blumenstingl @ 2018-09-24 20:17 ` Jonathan Cameron -1 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:17 UTC (permalink / raw) To: linus-amlogic On Sun, 23 Sep 2018 00:21:02 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > Commit 053ffe3c8cfe31 ("iio: adc: meson-saradc: squash and share the > common adc platform data") put all the data which is needed at runtime > from struct meson_sar_adc_data to a new struct meson_sar_adc_param so > we can re-use the platform specific configuration without having to > duplicate everything just to change the name. > > The only place where struct meson_sar_adc_data is now needed is the > _probe function which has to pass the name to the iio_dev. All other > functions only need access to struct meson_sar_adc_param. This means we > can simplify struct meson_sar_adc_priv. > > The goal of this patch is to make the code a bit easier to read since > this removes one level of nesting. No functional changes intended. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index 9d8f2139debc..1c4ba83c0725 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -234,7 +234,7 @@ struct meson_sar_adc_data { > struct meson_sar_adc_priv { > struct regmap *regmap; > struct regulator *vref; > - const struct meson_sar_adc_data *data; > + const struct meson_sar_adc_param *param; > struct clk *clkin; > struct clk *core_clk; > struct clk *adc_sel_clk; > @@ -279,7 +279,7 @@ static int meson_sar_adc_calib_val(struct iio_dev *indio_dev, int val) > /* use val_calib = scale * val_raw + offset calibration function */ > tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias; > > - return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1); > + return clamp(tmp, 0, (1 << priv->param->resolution) - 1); > } > > static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) > @@ -331,7 +331,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, > } > > fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval); > - fifo_val &= GENMASK(priv->data->param->resolution - 1, 0); > + fifo_val &= GENMASK(priv->param->resolution - 1, 0); > *val = meson_sar_adc_calib_val(indio_dev, fifo_val); > > return 0; > @@ -450,7 +450,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev) > > mutex_lock(&indio_dev->mlock); > > - if (priv->data->param->has_bl30_integration) { > + if (priv->param->has_bl30_integration) { > /* prevent BL30 from using the SAR ADC while we are using it */ > regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, > MESON_SAR_ADC_DELAY_KERNEL_BUSY, > @@ -478,7 +478,7 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev) > { > struct meson_sar_adc_priv *priv = iio_priv(indio_dev); > > - if (priv->data->param->has_bl30_integration) > + if (priv->param->has_bl30_integration) > /* allow BL30 to use the SAR ADC again */ > regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, > MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0); > @@ -562,7 +562,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev, > } > > *val = ret / 1000; > - *val2 = priv->data->param->resolution; > + *val2 = priv->param->resolution; > return IIO_VAL_FRACTIONAL_LOG2; > > case IIO_CHAN_INFO_CALIBBIAS: > @@ -635,7 +635,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > */ > meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT); > > - if (priv->data->param->has_bl30_integration) { > + if (priv->param->has_bl30_integration) { > /* > * leave sampling delay and the input clocks as configured by > * BL30 to make sure BL30 gets the values it expects when > @@ -715,7 +715,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > return ret; > } > > - ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate); > + ret = clk_set_rate(priv->adc_clk, priv->param->clock_rate); > if (ret) { > dev_err(indio_dev->dev.parent, > "failed to set adc clock rate\n"); > @@ -728,7 +728,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) > { > struct meson_sar_adc_priv *priv = iio_priv(indio_dev); > - const struct meson_sar_adc_param *param = priv->data->param; > + const struct meson_sar_adc_param *param = priv->param; > u32 enable_mask; > > if (param->bandgap_reg == MESON_SAR_ADC_REG11) > @@ -848,8 +848,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) > int ret, nominal0, nominal1, value0, value1; > > /* use points 25% and 75% for calibration */ > - nominal0 = (1 << priv->data->param->resolution) / 4; > - nominal1 = (1 << priv->data->param->resolution) * 3 / 4; > + nominal0 = (1 << priv->param->resolution) / 4; > + nominal1 = (1 << priv->param->resolution) * 3 / 4; > > meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); > usleep_range(10, 20); > @@ -1000,9 +1000,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > return -ENODEV; > } > > - priv->data = match_data; > + priv->param = match_data->param; > > - indio_dev->name = priv->data->name; > + indio_dev->name = match_data->name; > indio_dev->dev.parent = &pdev->dev; > indio_dev->dev.of_node = pdev->dev.of_node; > indio_dev->modes = INDIO_DIRECT_MODE; > @@ -1026,7 +1026,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > return ret; > > priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, > - priv->data->param->regmap_config); > + priv->param->regmap_config); > if (IS_ERR(priv->regmap)) > return PTR_ERR(priv->regmap); > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param @ 2018-09-24 20:17 ` Jonathan Cameron 0 siblings, 0 replies; 14+ messages in thread From: Jonathan Cameron @ 2018-09-24 20:17 UTC (permalink / raw) To: Martin Blumenstingl; +Cc: linux-amlogic, linux-iio, knaack.h, lars, pmeerw On Sun, 23 Sep 2018 00:21:02 +0200 Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > Commit 053ffe3c8cfe31 ("iio: adc: meson-saradc: squash and share the > common adc platform data") put all the data which is needed at runtime > from struct meson_sar_adc_data to a new struct meson_sar_adc_param so > we can re-use the platform specific configuration without having to > duplicate everything just to change the name. > > The only place where struct meson_sar_adc_data is now needed is the > _probe function which has to pass the name to the iio_dev. All other > functions only need access to struct meson_sar_adc_param. This means we > can simplify struct meson_sar_adc_priv. > > The goal of this patch is to make the code a bit easier to read since > this removes one level of nesting. No functional changes intended. > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks, Jonathan > --- > drivers/iio/adc/meson_saradc.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c > index 9d8f2139debc..1c4ba83c0725 100644 > --- a/drivers/iio/adc/meson_saradc.c > +++ b/drivers/iio/adc/meson_saradc.c > @@ -234,7 +234,7 @@ struct meson_sar_adc_data { > struct meson_sar_adc_priv { > struct regmap *regmap; > struct regulator *vref; > - const struct meson_sar_adc_data *data; > + const struct meson_sar_adc_param *param; > struct clk *clkin; > struct clk *core_clk; > struct clk *adc_sel_clk; > @@ -279,7 +279,7 @@ static int meson_sar_adc_calib_val(struct iio_dev *indio_dev, int val) > /* use val_calib = scale * val_raw + offset calibration function */ > tmp = div_s64((s64)val * priv->calibscale, MILLION) + priv->calibbias; > > - return clamp(tmp, 0, (1 << priv->data->param->resolution) - 1); > + return clamp(tmp, 0, (1 << priv->param->resolution) - 1); > } > > static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) > @@ -331,7 +331,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, > } > > fifo_val = FIELD_GET(MESON_SAR_ADC_FIFO_RD_SAMPLE_VALUE_MASK, regval); > - fifo_val &= GENMASK(priv->data->param->resolution - 1, 0); > + fifo_val &= GENMASK(priv->param->resolution - 1, 0); > *val = meson_sar_adc_calib_val(indio_dev, fifo_val); > > return 0; > @@ -450,7 +450,7 @@ static int meson_sar_adc_lock(struct iio_dev *indio_dev) > > mutex_lock(&indio_dev->mlock); > > - if (priv->data->param->has_bl30_integration) { > + if (priv->param->has_bl30_integration) { > /* prevent BL30 from using the SAR ADC while we are using it */ > regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, > MESON_SAR_ADC_DELAY_KERNEL_BUSY, > @@ -478,7 +478,7 @@ static void meson_sar_adc_unlock(struct iio_dev *indio_dev) > { > struct meson_sar_adc_priv *priv = iio_priv(indio_dev); > > - if (priv->data->param->has_bl30_integration) > + if (priv->param->has_bl30_integration) > /* allow BL30 to use the SAR ADC again */ > regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, > MESON_SAR_ADC_DELAY_KERNEL_BUSY, 0); > @@ -562,7 +562,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev, > } > > *val = ret / 1000; > - *val2 = priv->data->param->resolution; > + *val2 = priv->param->resolution; > return IIO_VAL_FRACTIONAL_LOG2; > > case IIO_CHAN_INFO_CALIBBIAS: > @@ -635,7 +635,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > */ > meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_CH7_INPUT); > > - if (priv->data->param->has_bl30_integration) { > + if (priv->param->has_bl30_integration) { > /* > * leave sampling delay and the input clocks as configured by > * BL30 to make sure BL30 gets the values it expects when > @@ -715,7 +715,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > return ret; > } > > - ret = clk_set_rate(priv->adc_clk, priv->data->param->clock_rate); > + ret = clk_set_rate(priv->adc_clk, priv->param->clock_rate); > if (ret) { > dev_err(indio_dev->dev.parent, > "failed to set adc clock rate\n"); > @@ -728,7 +728,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) > static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) > { > struct meson_sar_adc_priv *priv = iio_priv(indio_dev); > - const struct meson_sar_adc_param *param = priv->data->param; > + const struct meson_sar_adc_param *param = priv->param; > u32 enable_mask; > > if (param->bandgap_reg == MESON_SAR_ADC_REG11) > @@ -848,8 +848,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) > int ret, nominal0, nominal1, value0, value1; > > /* use points 25% and 75% for calibration */ > - nominal0 = (1 << priv->data->param->resolution) / 4; > - nominal1 = (1 << priv->data->param->resolution) * 3 / 4; > + nominal0 = (1 << priv->param->resolution) / 4; > + nominal1 = (1 << priv->param->resolution) * 3 / 4; > > meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); > usleep_range(10, 20); > @@ -1000,9 +1000,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > return -ENODEV; > } > > - priv->data = match_data; > + priv->param = match_data->param; > > - indio_dev->name = priv->data->name; > + indio_dev->name = match_data->name; > indio_dev->dev.parent = &pdev->dev; > indio_dev->dev.of_node = pdev->dev.of_node; > indio_dev->modes = INDIO_DIRECT_MODE; > @@ -1026,7 +1026,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev) > return ret; > > priv->regmap = devm_regmap_init_mmio(&pdev->dev, base, > - priv->data->param->regmap_config); > + priv->param->regmap_config); > if (IS_ERR(priv->regmap)) > return PTR_ERR(priv->regmap); > ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2018-09-25 2:21 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-09-22 22:20 [PATCH 0/3] meson-saradc: small code improvements Martin Blumenstingl 2018-09-22 22:20 ` Martin Blumenstingl 2018-09-22 22:21 ` [PATCH 1/3] iio: adc: meson-saradc: remove #define MESON_SAR_ADC_DELTA_10_TS_C_SHIFT Martin Blumenstingl 2018-09-22 22:21 ` Martin Blumenstingl 2018-09-24 20:13 ` Jonathan Cameron 2018-09-24 20:13 ` Jonathan Cameron 2018-09-22 22:21 ` [PATCH 2/3] iio: adc: meson-saradc: use of_device_get_match_data Martin Blumenstingl 2018-09-22 22:21 ` Martin Blumenstingl 2018-09-24 20:15 ` Jonathan Cameron 2018-09-24 20:15 ` Jonathan Cameron 2018-09-22 22:21 ` [PATCH 3/3] iio: adc: meson-saradc: simplify access to meson_sar_adc_param Martin Blumenstingl 2018-09-22 22:21 ` Martin Blumenstingl 2018-09-24 20:17 ` Jonathan Cameron 2018-09-24 20:17 ` Jonathan Cameron
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.