iio/adc: ingenic: add JZ4760 support to the sadc driver

The jz4760 sadc is very similar to the jz4770 one, but has a VREF of 2.5V
and 3 aux channels.

modify ingenic_adc_read_chan_info_raw() needs a change to account for it.

Signed-off-by: Christophe Branchereau <cbranchereau@gmail.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20210726082033.351533-4-cbranchereau@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c
index 40f2d8c2cf72ab0187a7c60979aefe658c837630..6b9af05305905f0c7bf37ac2bbbe07279e45b645 100644 (file)
--- a/drivers/iio/adc/ingenic-adc.c
+++ b/drivers/iio/adc/ingenic-adc.c
@@ -71,6 +71,7 @@
 #define JZ4725B_ADC_BATTERY_HIGH_VREF_BITS     10
 #define JZ4740_ADC_BATTERY_HIGH_VREF           (7500 * 0.986)
 #define JZ4740_ADC_BATTERY_HIGH_VREF_BITS      12
+#define JZ4760_ADC_BATTERY_VREF                        2500
 #define JZ4770_ADC_BATTERY_VREF                        1200
 #define JZ4770_ADC_BATTERY_VREF_BITS           12
 
@@ -295,6 +296,10 @@ static const int jz4740_adc_battery_scale_avail[] = {
        JZ_ADC_BATTERY_LOW_VREF, JZ_ADC_BATTERY_LOW_VREF_BITS,
 };
 
+static const int jz4760_adc_battery_scale_avail[] = {
+       JZ4760_ADC_BATTERY_VREF, JZ4770_ADC_BATTERY_VREF_BITS,
+};
+
 static const int jz4770_adc_battery_raw_avail[] = {
        0, 1, (1 << JZ4770_ADC_BATTERY_VREF_BITS) - 1,
 };
@@ -400,6 +405,47 @@ static const struct iio_chan_spec jz4740_channels[] = {
        },
 };
 
+static const struct iio_chan_spec jz4760_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_AUX0,
+               .scan_index = -1,
+       },
+       {
+               .extend_name = "aux1",
+               .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 = "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,
+       },
+       {
+               .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[] = {
        {
                .type = IIO_VOLTAGE,
@@ -526,6 +572,20 @@ static const struct ingenic_adc_soc_data jz4740_adc_soc_data = {
        .init_clk_div = NULL, /* no ADCLK register on JZ4740 */
 };
 
+static const struct ingenic_adc_soc_data jz4760_adc_soc_data = {
+       .battery_high_vref = JZ4760_ADC_BATTERY_VREF,
+       .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS,
+       .battery_raw_avail = jz4770_adc_battery_raw_avail,
+       .battery_raw_avail_size = ARRAY_SIZE(jz4770_adc_battery_raw_avail),
+       .battery_scale_avail = jz4760_adc_battery_scale_avail,
+       .battery_scale_avail_size = ARRAY_SIZE(jz4760_adc_battery_scale_avail),
+       .battery_vref_mode = false,
+       .has_aux_md = true,
+       .channels = jz4760_channels,
+       .num_channels = ARRAY_SIZE(jz4760_channels),
+       .init_clk_div = jz4770_adc_init_clk_div,
+};
+
 static const struct ingenic_adc_soc_data jz4770_adc_soc_data = {
        .battery_high_vref = JZ4770_ADC_BATTERY_VREF,
        .battery_high_vref_bits = JZ4770_ADC_BATTERY_VREF_BITS,
@@ -569,7 +629,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_dev *iio_dev,
                                          struct iio_chan_spec const *chan,
                                          int *val)
 {
-       int bit, ret, engine = (chan->channel == INGENIC_ADC_BATTERY);
+       int cmd, ret, engine = (chan->channel == INGENIC_ADC_BATTERY);
        struct ingenic_adc *adc = iio_priv(iio_dev);
 
        ret = clk_enable(adc->clk);
@@ -579,11 +639,22 @@ static int ingenic_adc_read_chan_info_raw(struct iio_dev *iio_dev,
                return ret;
        }
 
-       /* We cannot sample AUX/AUX2 in parallel. */
+       /* We cannot sample the aux channels in parallel. */
        mutex_lock(&adc->aux_lock);
        if (adc->soc_data->has_aux_md && engine == 0) {
-               bit = BIT(chan->channel == INGENIC_ADC_AUX2);
-               ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, bit);
+               switch (chan->channel) {
+               case INGENIC_ADC_AUX0:
+                       cmd = 0;
+                       break;
+               case INGENIC_ADC_AUX:
+                       cmd = 1;
+                       break;
+               case INGENIC_ADC_AUX2:
+                       cmd = 2;
+                       break;
+               }
+
+               ingenic_adc_set_config(adc, JZ_ADC_REG_CFG_AUX_MD, cmd);
        }
 
        ret = ingenic_adc_capture(adc, engine);
@@ -591,6 +662,7 @@ static int ingenic_adc_read_chan_info_raw(struct iio_dev *iio_dev,
                goto out;
 
        switch (chan->channel) {
+       case INGENIC_ADC_AUX0:
        case INGENIC_ADC_AUX:
        case INGENIC_ADC_AUX2:
                *val = readw(adc->base + JZ_ADC_REG_ADSDAT);
@@ -621,6 +693,7 @@ static int ingenic_adc_read_raw(struct iio_dev *iio_dev,
                return ingenic_adc_read_chan_info_raw(iio_dev, chan, val);
        case IIO_CHAN_INFO_SCALE:
                switch (chan->channel) {
+               case INGENIC_ADC_AUX0:
                case INGENIC_ADC_AUX:
                case INGENIC_ADC_AUX2:
                        *val = JZ_ADC_AUX_VREF;
@@ -832,6 +905,7 @@ static int ingenic_adc_probe(struct platform_device *pdev)
 static const struct of_device_id ingenic_adc_of_match[] = {
        { .compatible = "ingenic,jz4725b-adc", .data = &jz4725b_adc_soc_data, },
        { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, },
+       { .compatible = "ingenic,jz4760-adc", .data = &jz4760_adc_soc_data, },
        { .compatible = "ingenic,jz4770-adc", .data = &jz4770_adc_soc_data, },
        { },
 };