On Fri, 2025-01-10 at 11:24 +0100, Angelo Dureghello wrote:
> From: Angelo Dureghello <adureghello@xxxxxxxxxxxx>
>
> Preparing for new parts to be added also in the hs driver,
> set model data structures in ad3552r-common.c, to be accessible
> from both -hs and non hs driver.
>
> Signed-off-by: Angelo Dureghello <adureghello@xxxxxxxxxxxx>
> ---
Reviewed-by: Nuno Sa <nuno.sa@xxxxxxxxxx>
> drivers/iio/dac/ad3552r-common.c | 46 ++++++++++++++++++++++++++++++++++++---
> -
> drivers/iio/dac/ad3552r-hs.c | 8 -------
> drivers/iio/dac/ad3552r.c | 36 -------------------------------
> drivers/iio/dac/ad3552r.h | 6 ++++--
> 4 files changed, 46 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/iio/dac/ad3552r-common.c b/drivers/iio/dac/ad3552r-
> common.c
> index 03e0864f5084..ded90bf57baf 100644
> --- a/drivers/iio/dac/ad3552r-common.c
> +++ b/drivers/iio/dac/ad3552r-common.c
> @@ -11,23 +11,21 @@
>
> #include "ad3552r.h"
>
> -const s32 ad3552r_ch_ranges[AD3552R_MAX_RANGES][2] = {
> +static const s32 ad3552r_ch_ranges[AD3552R_MAX_RANGES][2] = {
> [AD3552R_CH_OUTPUT_RANGE_0__2P5V] = { 0, 2500 },
> [AD3552R_CH_OUTPUT_RANGE_0__5V] = { 0, 5000 },
> [AD3552R_CH_OUTPUT_RANGE_0__10V] = { 0, 10000 },
> [AD3552R_CH_OUTPUT_RANGE_NEG_5__5V] = { -5000, 5000 },
> [AD3552R_CH_OUTPUT_RANGE_NEG_10__10V] = { -10000, 10000 }
> };
> -EXPORT_SYMBOL_NS_GPL(ad3552r_ch_ranges, "IIO_AD3552R");
>
> -const s32 ad3542r_ch_ranges[AD3542R_MAX_RANGES][2] = {
> +static const s32 ad3542r_ch_ranges[AD3542R_MAX_RANGES][2] = {
> [AD3542R_CH_OUTPUT_RANGE_0__2P5V] = { 0, 2500 },
> [AD3542R_CH_OUTPUT_RANGE_0__5V] = { 0, 5000 },
> [AD3542R_CH_OUTPUT_RANGE_0__10V] = { 0, 10000 },
> [AD3542R_CH_OUTPUT_RANGE_NEG_5__5V] = { -5000, 5000 },
> [AD3542R_CH_OUTPUT_RANGE_NEG_2P5__7P5V] = { -2500, 7500 }
> };
> -EXPORT_SYMBOL_NS_GPL(ad3542r_ch_ranges, "IIO_AD3552R");
>
> /* Gain * AD3552R_GAIN_SCALE */
> static const s32 gains_scaling_table[] = {
> @@ -37,6 +35,46 @@ static const s32 gains_scaling_table[] = {
> [AD3552R_CH_GAIN_SCALING_0_125] = 125
> };
>
> +const struct ad3552r_model_data ad3541r_model_data = {
> + .model_name = "ad3541r",
> + .chip_id = AD3541R_ID,
> + .num_hw_channels = 1,
> + .ranges_table = ad3542r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> + .requires_output_range = true,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3541r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3542r_model_data = {
> + .model_name = "ad3542r",
> + .chip_id = AD3542R_ID,
> + .num_hw_channels = 2,
> + .ranges_table = ad3542r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> + .requires_output_range = true,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3542r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3551r_model_data = {
> + .model_name = "ad3551r",
> + .chip_id = AD3551R_ID,
> + .num_hw_channels = 1,
> + .ranges_table = ad3552r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> + .requires_output_range = false,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3551r_model_data, "IIO_AD3552R");
> +
> +const struct ad3552r_model_data ad3552r_model_data = {
> + .model_name = "ad3552r",
> + .chip_id = AD3552R_ID,
> + .num_hw_channels = 2,
> + .ranges_table = ad3552r_ch_ranges,
> + .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> + .requires_output_range = false,
> +};
> +EXPORT_SYMBOL_NS_GPL(ad3552r_model_data, "IIO_AD3552R");
> +
> u16 ad3552r_calc_custom_gain(u8 p, u8 n, s16 goffs)
> {
> return FIELD_PREP(AD3552R_MASK_CH_RANGE_OVERRIDE, 1) |
> diff --git a/drivers/iio/dac/ad3552r-hs.c b/drivers/iio/dac/ad3552r-hs.c
> index 991b11702273..bfb6228c9b9b 100644
> --- a/drivers/iio/dac/ad3552r-hs.c
> +++ b/drivers/iio/dac/ad3552r-hs.c
> @@ -527,14 +527,6 @@ static int ad3552r_hs_probe(struct platform_device *pdev)
> return devm_iio_device_register(&pdev->dev, indio_dev);
> }
>
> -static const struct ad3552r_model_data ad3552r_model_data = {
> - .model_name = "ad3552r",
> - .chip_id = AD3552R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> -};
> -
> static const struct of_device_id ad3552r_hs_of_id[] = {
> { .compatible = "adi,ad3552r", .data = &ad3552r_model_data },
> { }
> diff --git a/drivers/iio/dac/ad3552r.c b/drivers/iio/dac/ad3552r.c
> index e7206af53af6..9d28e06b80c0 100644
> --- a/drivers/iio/dac/ad3552r.c
> +++ b/drivers/iio/dac/ad3552r.c
> @@ -649,42 +649,6 @@ static int ad3552r_probe(struct spi_device *spi)
> return devm_iio_device_register(&spi->dev, indio_dev);
> }
>
> -static const struct ad3552r_model_data ad3541r_model_data = {
> - .model_name = "ad3541r",
> - .chip_id = AD3541R_ID,
> - .num_hw_channels = 1,
> - .ranges_table = ad3542r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> - .requires_output_range = true,
> -};
> -
> -static const struct ad3552r_model_data ad3542r_model_data = {
> - .model_name = "ad3542r",
> - .chip_id = AD3542R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3542r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3542r_ch_ranges),
> - .requires_output_range = true,
> -};
> -
> -static const struct ad3552r_model_data ad3551r_model_data = {
> - .model_name = "ad3551r",
> - .chip_id = AD3551R_ID,
> - .num_hw_channels = 1,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> - .requires_output_range = false,
> -};
> -
> -static const struct ad3552r_model_data ad3552r_model_data = {
> - .model_name = "ad3552r",
> - .chip_id = AD3552R_ID,
> - .num_hw_channels = 2,
> - .ranges_table = ad3552r_ch_ranges,
> - .num_ranges = ARRAY_SIZE(ad3552r_ch_ranges),
> - .requires_output_range = false,
> -};
> -
> static const struct spi_device_id ad3552r_id[] = {
> {
> .name = "ad3541r",
> diff --git a/drivers/iio/dac/ad3552r.h b/drivers/iio/dac/ad3552r.h
> index 4b5581039ae9..3dc8d1d9c0f9 100644
> --- a/drivers/iio/dac/ad3552r.h
> +++ b/drivers/iio/dac/ad3552r.h
> @@ -134,8 +134,10 @@
> #define AD3542R_MAX_RANGES 5
> #define AD3552R_QUAD_SPI 2
>
> -extern const s32 ad3552r_ch_ranges[AD3552R_MAX_RANGES][2];
> -extern const s32 ad3542r_ch_ranges[AD3542R_MAX_RANGES][2];
> +extern const struct ad3552r_model_data ad3541r_model_data;
> +extern const struct ad3552r_model_data ad3542r_model_data;
> +extern const struct ad3552r_model_data ad3551r_model_data;
> +extern const struct ad3552r_model_data ad3552r_model_data;
>
> enum ad3552r_id {
> AD3541R_ID = 0x400b,
>
