iio: dac: ad3552r: share model data structures

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.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
Link: https://patch.msgid.link/20250114-wip-bl-ad3552r-axi-v0-iio-testing-carlos-v4-7-979402e33545@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad3552r-common.c b/drivers/iio/dac/ad3552r-common.c
index 03e0864f50846b7a6578d9a855e01181d3382e6c..ded90bf57baf00863b4732ecf75f597e4eede379 100644 (file)
--- 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 25ee716b57cd33a656277bbf03e768b51dda296f..98711f742c701e62ef4f3f16d142377e715dbde8 100644 (file)
--- a/drivers/iio/dac/ad3552r-hs.c
+++ b/drivers/iio/dac/ad3552r-hs.c
@@ -532,14 +532,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 e7206af53af619eaaf5daca81e66ed1782ef82a2..9d28e06b80c06be9d35350003f2fcfcf14a6ee4e 100644 (file)
--- 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 4b5581039ae95d91372e77c11d3fb0595efd18a5..3dc8d1d9c0f9f5d0d7e60bb50cc28ff10699aad2 100644 (file)
--- 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,