iio: adc: sc27xx: adjust structure and add PMIC's support

From: Cixi Geng <[email protected]>

sprd,ump9620-adc is one variant of sc27xx series, add ump9620 in dtbindings.

Signed-off-by Chunyan Zhang <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 .../bindings/iio/adc/sprd,sc2720-adc.yaml     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

From: Cixi Geng <[email protected]>

Fix wrong configuration value of SC27XX_ADC_SCALE_MASK and SC27XX_ADC_SCALE_SHIFT by spec documetation.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/iio/adc/sc27xx_adc.c +2 -3

index 00098caf6d9e..aee076c8e2b1 100644
@@ -36,8 +36,8 @@
 
 /* Bits and mask definition for SC27XX_ADC_CH_CFG register */
 #define SC27XX_ADC_CHN_ID_MASK         GENMASK(4, 0)
-#define SC27XX_ADC_SCALE_MASK          GENMASK(10, 8)
-#define SC27XX_ADC_SCALE_SHIFT         8
+#define SC27XX_ADC_SCALE_MASK          GENMASK(10, 9)
+#define SC27XX_ADC_SCALE_SHIFT         9
 
 /* Bits definitions for SC27XX_ADC_INT_EN registers */
 #define SC27XX_ADC_IRQ_EN              BIT(0)
--

2.25.1

Quoted 8 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Fix wrong configuration value of SC27XX_ADC_SCALE_MASK and SC27XX_ADC_SCALE_SHIFT by spec documetation.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

Reviewed-by Baolin Wang <[email protected]>

Quoted 23 lines

---
 drivers/iio/adc/sc27xx_adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/iio/adc/sc27xx_adc.c +2 -3

index 00098caf6d9e..aee076c8e2b1 100644
@@ -36,8 +36,8 @@
 
 /* Bits and mask definition for SC27XX_ADC_CH_CFG register */
 #define SC27XX_ADC_CHN_ID_MASK         GENMASK(4, 0)
-#define SC27XX_ADC_SCALE_MASK          GENMASK(10, 8)
-#define SC27XX_ADC_SCALE_SHIFT         8
+#define SC27XX_ADC_SCALE_MASK          GENMASK(10, 9)
+#define SC27XX_ADC_SCALE_SHIFT         9
 
 /* Bits definitions for SC27XX_ADC_INT_EN registers */
 #define SC27XX_ADC_IRQ_EN              BIT(0)
--

2.25.1

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c +8 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)

drivers/iio/adc/sc27xx_adc.c +33 -11

+
 static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                           int scale, int *val)
 {

@@ -208,10 +250,11 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                goto disable_adc;
 
        /* Configure the channel id and scale */
-       tmp = (scale << SC27XX_ADC_SCALE_SHIFT) & SC27XX_ADC_SCALE_MASK;
+       tmp = (scale << data->var_data->scale_shift) & data->var_data->scale_mask;
        tmp |= channel & SC27XX_ADC_CHN_ID_MASK;
        ret = regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CH_CFG,
-                                SC27XX_ADC_CHN_ID_MASK | SC27XX_ADC_SCALE_MASK,
+                                SC27XX_ADC_CHN_ID_MASK |
+                                data->var_data->scale_mask,
                                 tmp);
        if (ret)
                goto disable_adc;

@@ -262,8 +305,9 @@ static void sc27xx_adc_volt_ratio(struct sc27xx_adc_data *data,
                                  int channel, int scale,
                                  u32 *div_numerator, u32 *div_denominator)
 {
-       u32 ratio = sc27xx_adc_get_ratio(channel, scale);
+       u32 ratio;
 
+       ratio = data->var_data->get_ratio(channel, scale);
        *div_numerator = ratio >> SC27XX_RATIO_NUMERATOR_OFFSET;
        *div_denominator = ratio & SC27XX_RATIO_DENOMINATOR_MASK;
 }

@@ -432,13 +476,13 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
 {
        int ret;
 
-       ret = regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       ret = regmap_update_bits(data->regmap, data->var_data->module_en,
                                 SC27XX_MODULE_ADC_EN, SC27XX_MODULE_ADC_EN);
        if (ret)
                return ret;
 
        /* Enable ADC work clock and controller clock */
-       ret = regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       ret = regmap_update_bits(data->regmap, data->var_data->clk_en,
                                 SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN,
                                 SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN);
        if (ret)

@@ -456,10 +500,10 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
        return 0;
 
 disable_clk:
-       regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       regmap_update_bits(data->regmap, data->var_data->clk_en,
                           SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
 disable_adc:
-       regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       regmap_update_bits(data->regmap, data->var_data->module_en,
                           SC27XX_MODULE_ADC_EN, 0);
 
        return ret;

@@ -470,21 +514,39 @@ static void sc27xx_adc_disable(void *_data)
        struct sc27xx_adc_data *data = _data;
 
        /* Disable ADC work clock and controller clock */
-       regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       regmap_update_bits(data->regmap, data->var_data->clk_en,
                           SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
 
-       regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       regmap_update_bits(data->regmap, data->var_data->module_en,
                           SC27XX_MODULE_ADC_EN, 0);
 }
 
+static const struct sc27xx_adc_variant_data sc2731_data = {
+       .module_en = SC2731_MODULE_EN,
+       .clk_en = SC2731_ARM_CLK_EN,
+       .scale_shift = SC27XX_ADC_SCALE_SHIFT,
+       .scale_mask = SC27XX_ADC_SCALE_MASK,
+       .bscale_cal = &sc2731_big_scale_graph_calib,
+       .sscale_cal = &sc2731_small_scale_graph_calib,
+       .init_scale = sc2731_adc_scale_init,
+       .get_ratio = sc2731_adc_get_ratio,
+};
+
 static int sc27xx_adc_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        struct sc27xx_adc_data *sc27xx_data;
+       const struct sc27xx_adc_variant_data *pdata;
        struct iio_dev *indio_dev;
        int ret;
 
+       pdata = of_device_get_match_data(dev);
+       if (!pdata) {
+               dev_err(dev, "No matching driver data found\n");
+               return -EINVAL;
+       }
+
        indio_dev = devm_iio_device_alloc(dev, sizeof(*sc27xx_data));
        if (!indio_dev)
                return -ENOMEM;

@@ -520,6 +582,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
        }
 
        sc27xx_data->dev = dev;
+       sc27xx_data->var_data = pdata;
+       sc27xx_data->var_data->init_scale(sc27xx_data);
 
        ret = sc27xx_adc_enable(sc27xx_data);
        if (ret) {

@@ -546,7 +610,7 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id sc27xx_adc_of_match[] = {
-       { .compatible = "sprd,sc2731-adc", },
+       { .compatible = "sprd,sc2731-adc", .data = &sc2731_data},
        { }
 };
 MODULE_DEVICE_TABLE(of, sc27xx_adc_of_match);
--

2.25.1

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 120 lines

drivers/iio/adc/sc27xx_adc.c +33 -11

+
 static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                           int scale, int *val)
 {

@@ -208,10 +250,11 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                goto disable_adc;
 
        /* Configure the channel id and scale */
-       tmp = (scale << SC27XX_ADC_SCALE_SHIFT) & SC27XX_ADC_SCALE_MASK;
+       tmp = (scale << data->var_data->scale_shift) & data->var_data->scale_mask;
        tmp |= channel & SC27XX_ADC_CHN_ID_MASK;
        ret = regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CH_CFG,
-                                SC27XX_ADC_CHN_ID_MASK | SC27XX_ADC_SCALE_MASK,
+                                SC27XX_ADC_CHN_ID_MASK |
+                                data->var_data->scale_mask,
                                 tmp);
        if (ret)
                goto disable_adc;

@@ -262,8 +305,9 @@ static void sc27xx_adc_volt_ratio(struct sc27xx_adc_data *data,
                                  int channel, int scale,
                                  u32 *div_numerator, u32 *div_denominator)
 {
-       u32 ratio = sc27xx_adc_get_ratio(channel, scale);
+       u32 ratio;
 
+       ratio = data->var_data->get_ratio(channel, scale);
        *div_numerator = ratio >> SC27XX_RATIO_NUMERATOR_OFFSET;
        *div_denominator = ratio & SC27XX_RATIO_DENOMINATOR_MASK;
 }

@@ -432,13 +476,13 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
 {
        int ret;
 
-       ret = regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       ret = regmap_update_bits(data->regmap, data->var_data->module_en,
                                 SC27XX_MODULE_ADC_EN, SC27XX_MODULE_ADC_EN);
        if (ret)
                return ret;
 
        /* Enable ADC work clock and controller clock */
-       ret = regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       ret = regmap_update_bits(data->regmap, data->var_data->clk_en,
                                 SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN,
                                 SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN);
        if (ret)

@@ -456,10 +500,10 @@ static int sc27xx_adc_enable(struct sc27xx_adc_data *data)
        return 0;
 
 disable_clk:
-       regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       regmap_update_bits(data->regmap, data->var_data->clk_en,
                           SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
 disable_adc:
-       regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       regmap_update_bits(data->regmap, data->var_data->module_en,
                           SC27XX_MODULE_ADC_EN, 0);
 
        return ret;

@@ -470,21 +514,39 @@ static void sc27xx_adc_disable(void *_data)
        struct sc27xx_adc_data *data = _data;
 
        /* Disable ADC work clock and controller clock */
-       regmap_update_bits(data->regmap, SC27XX_ARM_CLK_EN,
+       regmap_update_bits(data->regmap, data->var_data->clk_en,
                           SC27XX_CLK_ADC_EN | SC27XX_CLK_ADC_CLK_EN, 0);
 
-       regmap_update_bits(data->regmap, SC27XX_MODULE_EN,
+       regmap_update_bits(data->regmap, data->var_data->module_en,
                           SC27XX_MODULE_ADC_EN, 0);
 }
 
+static const struct sc27xx_adc_variant_data sc2731_data = {
+       .module_en = SC2731_MODULE_EN,
+       .clk_en = SC2731_ARM_CLK_EN,
+       .scale_shift = SC27XX_ADC_SCALE_SHIFT,
+       .scale_mask = SC27XX_ADC_SCALE_MASK,
+       .bscale_cal = &sc2731_big_scale_graph_calib,
+       .sscale_cal = &sc2731_small_scale_graph_calib,
+       .init_scale = sc2731_adc_scale_init,
+       .get_ratio = sc2731_adc_get_ratio,
+};
+
 static int sc27xx_adc_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = dev->of_node;
        struct sc27xx_adc_data *sc27xx_data;
+       const struct sc27xx_adc_variant_data *pdata;
        struct iio_dev *indio_dev;
        int ret;
 
+       pdata = of_device_get_match_data(dev);
+       if (!pdata) {
+               dev_err(dev, "No matching driver data found\n");
+               return -EINVAL;
+       }
+
        indio_dev = devm_iio_device_alloc(dev, sizeof(*sc27xx_data));
        if (!indio_dev)
                return -ENOMEM;

@@ -520,6 +582,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
        }
 
        sc27xx_data->dev = dev;
+       sc27xx_data->var_data = pdata;
+       sc27xx_data->var_data->init_scale(sc27xx_data);
 
        ret = sc27xx_adc_enable(sc27xx_data);
        if (ret) {

@@ -546,7 +610,7 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id sc27xx_adc_of_match[] = {
-       { .compatible = "sprd,sc2731-adc", },
+       { .compatible = "sprd,sc2731-adc", .data = &sc2731_data},
        { }
 };
 MODULE_DEVICE_TABLE(of, sc27xx_adc_of_match);
--

Quoted 2 lines

2.25.1

--
Baolin Wang

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

Quoted 122 lines · Cixi Geng

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 2 lines

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

No.

Quoted 3 lines

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

What I mean is we should follow the original method to set the channel scale by iio_info. Please also refer to other drivers how ot handle the channel scale.

--
Baolin Wang

Quoted 129 lines · Baolin Wang <[email protected]> 于2022年1月17日周一 14:15写道：

Quoted 122 lines · Cixi Geng

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 2 lines

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

No.

Quoted 7 lines

Quoted 3 lines

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

What I mean is we should follow the original method to set the channel scale by iio_info. Please also refer to other drivers how ot handle the channel scale.

Hi Baolin, I understand the adc_write_raw() function is the method to set channal scale for the userspace, we can change the channel scale by write a value on a user code. did i understand right?
out scale_init is to set scale value when the driver probe stage, and I also did not found other adc driver use the adc_write_raw() during the driver
initialization phase.

Quoted 138 lines · Cixi Geng

Quoted 129 lines · Baolin Wang <[email protected]> 于2022年1月17日周一 14:15写道：

Quoted 122 lines · Cixi Geng

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 2 lines

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

No.

Quoted 7 lines

Quoted 3 lines

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

What I mean is we should follow the original method to set the channel scale by iio_info. Please also refer to other drivers how ot handle the channel scale.

Quoted 6 lines

Hi Baolin, I understand the adc_write_raw() function is the method to set channal scale for the userspace, we can change the channel scale by write a value on a user code. did i understand right?
out scale_init is to set scale value when the driver probe stage, and I also did not found other adc driver use the adc_write_raw() during the driver
initialization phase.

Hi Jonathan,

How do you think about the method in this patch to set the channel scale? Thanks.

--
Baolin Wang

Quoted 147 lines · Baolin Wang <[email protected]> 于2022年2月10日周四 16:07写道：

Quoted 144 lines · Cixi Geng

Quoted 129 lines · Baolin Wang <[email protected]> 于2022年1月17日周一 14:15写道：

Quoted 122 lines · Cixi Geng

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};  

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}  

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 2 lines

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

No.

Quoted 7 lines

Quoted 3 lines

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

What I mean is we should follow the original method to set the channel scale by iio_info. Please also refer to other drivers how ot handle the channel scale.

Hi Baolin, I understand the adc_write_raw() function is the method to set channal scale for the userspace, we can change the channel scale by write a value on a user code. did i understand right?
out scale_init is to set scale value when the driver probe stage, and I also did not found other adc driver use the adc_write_raw() during the driver
initialization phase.

Quoted 5 lines

Hi Jonathan,

How do you think about the method in this patch to set the channel scale? Thanks.

Hi Jonathan,
Could you have a loot at this patch ,and give some advice about the method to set the channel scale? Thanks very much.

Quoted 2 lines

--
Baolin Wang

Quoted 148 lines · On Wed, 23 Feb 2022 20:46:08 +0800 Cixi Geng <[email protected]> wrote:

Quoted 147 lines · Baolin Wang <[email protected]> 于2022年2月10日周四 16:07写道：

Quoted 144 lines · Cixi Geng

Quoted 129 lines · Baolin Wang <[email protected]> 于2022年1月17日周一 14:15写道：

Quoted 122 lines · Cixi Geng

Quoted 112 lines · Baolin Wang <[email protected]> 于2022年1月7日周五 15:03写道：

Quoted 56 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Introduce one variant device data structure to be compatible with SC2731 PMIC since it has different scale and ratio calculation and so on.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 94 ++++++++++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 15 deletions(-)

drivers/iio/adc/sc27xx_adc.c +19 -2

index aee076c8e2b1..d2712e54ee79 100644
@@ -12,9 +12,9 @@
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
-#define SC27XX_MODULE_EN               0xc08
+#define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
-#define SC27XX_ARM_CLK_EN              0xc10
+#define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
 

@@ -78,6 +78,23 @@ struct sc27xx_adc_data {
        int channel_scale[SC27XX_ADC_CHANNEL_MAX];
        u32 base;
        int irq;
+       const struct sc27xx_adc_variant_data *var_data;
+};
+
+/*
+ * Since different PMICs of SC27xx series can have different
+ * address and ratio, we should save ratio config and base
+ * in the device data structure.
+ */
+struct sc27xx_adc_variant_data {
+       u32 module_en;
+       u32 clk_en;
+       u32 scale_shift;
+       u32 scale_mask;
+       const struct sc27xx_adc_linear_graph *bscale_cal;
+       const struct sc27xx_adc_linear_graph *sscale_cal;
+       void (*init_scale)(struct sc27xx_adc_data *data);
+       int (*get_ratio)(int channel, int scale);
 };
 
 struct sc27xx_adc_linear_graph {

@@ -103,6 +120,16 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };

drivers/iio/adc/sc27xx_adc.c static struct sc27xx_adc_linear_graph small_scale_graph = { · line 131

Quoted 10 lines

drivers/iio/adc/sc27xx_adc.c +9 -0

 
+static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
+       4200, 850,
+       3600, 728,
+};
+
+static const struct sc27xx_adc_linear_graph sc2731_small_scale_graph_calib = {
+       1000, 838,
+       100, 84,
+};

The original big_scale_graph_calib and small_scale_graph_calib are for SC2731 PMIC, why add new structure definition for SC2731?

Quoted 40 lines

drivers/iio/adc/sc27xx_adc.c +13 -3

+
 static const struct sc27xx_adc_linear_graph big_scale_graph_calib = {
        4200, 856,
        3600, 733,

@@ -130,11 +157,11 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        size_t len;
 
        if (big_scale) {
-               calib_graph = &big_scale_graph_calib;
+               calib_graph = data->var_data->bscale_cal;
                graph = &big_scale_graph;
                cell_name = "big_scale_calib";
        } else {
-               calib_graph = &small_scale_graph_calib;
+               calib_graph = data->var_data->sscale_cal;
                graph = &small_scale_graph;
                cell_name = "small_scale_calib";
        }

@@ -160,7 +187,7 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
-static int sc27xx_adc_get_ratio(int channel, int scale)
+static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {
        case 1:

@@ -185,6 +212,21 @@ static int sc27xx_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+/*
+ * According to the datasheet set specific value on some channel.
+ */
+static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 5)

Quoted 8 lines

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_get_ratio(int channel, int scale) · line 228

Quoted 5 lines

drivers/iio/adc/sc27xx_adc.c +5 -0

+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}

This is unnecessary I think, please see sc27xx_adc_write_raw() that can set the channel scale.

Quoted 2 lines

Did you mean that all the PMIC's scale_init function should put into the sc27xx_adc_write_raw?

No.

Quoted 7 lines

Quoted 3 lines

but the scale_init is all different by each PMIC, if implemented in the write_raw, will add a lot of
if or switch_case branch

What I mean is we should follow the original method to set the channel scale by iio_info. Please also refer to other drivers how ot handle the channel scale.

Hi Baolin, I understand the adc_write_raw() function is the method to set channal scale for the userspace, we can change the channel scale by write a value on a user code. did i understand right?
out scale_init is to set scale value when the driver probe stage, and I also did not found other adc driver use the adc_write_raw() during the driver
initialization phase.

Quoted 8 lines

Quoted 5 lines

Hi Jonathan,

How do you think about the method in this patch to set the channel scale? Thanks.

Hi Jonathan,
Could you have a loot at this patch ,and give some advice about the method to set the channel scale? Thanks very much.

Hi, thanks for poking me on this - I'd missed the question buried deep in the thread!

Anyhow, I don't quite follow the discussion but think it could be focused on one of 2 questions...

1) Does setting an initial default make sense?
Yes, this is an acceptable thing to do if there is a particular set of defaults and there is no risk of regressions (i.e. the device wasn't previously supported with different defaults).
2) Should you use the write_raw callback to actually do the setting? Probably not as it has a set of parameters that don't make as much sense from within the driver. It 'might' make sense to have a common _set() function for this feature which is called both in this initialization case and from the write_raw() function however as that could do bounds checking etc in one common place. However, it is very simple here, so perhaps not necessary.

Jonathan

Quoted 2 lines

Quoted 2 lines

--
Baolin Wang

From: Cixi Geng <[email protected]>

sc2720 and sc2721 is the product of sc27xx series.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 198 +++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)

drivers/iio/adc/sc27xx_adc.c +7 -0

index d2712e54ee79..7b5c66660ac9 100644
@@ -9,11 +9,13 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
 #define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
+#define SC2721_ARM_CLK_EN              0xc0c
 #define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)

@@ -37,7 +39,9 @@
 /* Bits and mask definition for SC27XX_ADC_CH_CFG register */
 #define SC27XX_ADC_CHN_ID_MASK         GENMASK(4, 0)
 #define SC27XX_ADC_SCALE_MASK          GENMASK(10, 9)
+#define SC2721_ADC_SCALE_MASK          BIT(5)
 #define SC27XX_ADC_SCALE_SHIFT         9
+#define SC2721_ADC_SCALE_SHIFT         5
 
 /* Bits definitions for SC27XX_ADC_INT_EN registers */
 #define SC27XX_ADC_IRQ_EN              BIT(0)

@@ -67,8 +71,21 @@
 #define SC27XX_RATIO_NUMERATOR_OFFSET  16
 #define SC27XX_RATIO_DENOMINATOR_MASK  GENMASK(15, 0)
 
+/* ADC specific channel reference voltage 3.5V */
+#define SC27XX_ADC_REFVOL_VDD35                3500000
+

drivers/iio/adc/sc27xx_adc.c +107 -0

        struct device *dev;
+       struct regulator *volref;
        struct regmap *regmap;
        /*
         * One hardware spinlock to synchronize between the multiple

@@ -87,6 +104,7 @@ struct sc27xx_adc_data {
  * in the device data structure.
  */
 struct sc27xx_adc_variant_data {
+       enum sc27xx_pmic_type pmic_type;
        u32 module_en;
        u32 clk_en;
        u32 scale_shift;

@@ -187,6 +205,94 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
+static int sc2720_adc_get_ratio(int channel, int scale)
+{
+       switch (channel) {
+       case 14:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(68, 900);
+               case 1:
+                       return SC27XX_VOLT_RATIO(68, 1760);
+               case 2:
+                       return SC27XX_VOLT_RATIO(68, 2327);
+               case 3:
+                       return SC27XX_VOLT_RATIO(68, 3654);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       case 16:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(48, 100);
+               case 1:
+                       return SC27XX_VOLT_RATIO(480, 1955);
+               case 2:
+                       return SC27XX_VOLT_RATIO(480, 2586);
+               case 3:
+                       return SC27XX_VOLT_RATIO(48, 406);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       case 21:
+       case 22:
+       case 23:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(3, 8);
+               case 1:
+                       return SC27XX_VOLT_RATIO(375, 1955);
+               case 2:
+                       return SC27XX_VOLT_RATIO(375, 2586);
+               case 3:
+                       return SC27XX_VOLT_RATIO(300, 3248);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       default:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               case 1:
+                       return SC27XX_VOLT_RATIO(1000, 1955);
+               case 2:
+                       return SC27XX_VOLT_RATIO(1000, 2586);
+               case 3:
+                       return SC27XX_VOLT_RATIO(100, 406);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       }
+       return SC27XX_VOLT_RATIO(1, 1);
+}
+
+static int sc2721_adc_get_ratio(int channel, int scale)
+{
+       switch (channel) {
+       case 1:
+       case 2:
+       case 3:
+       case 4:
+               return scale ? SC27XX_VOLT_RATIO(400, 1025) :
+                       SC27XX_VOLT_RATIO(1, 1);
+       case 5:
+               return SC27XX_VOLT_RATIO(7, 29);
+       case 7:
+       case 9:
+               return scale ? SC27XX_VOLT_RATIO(100, 125) :
+                       SC27XX_VOLT_RATIO(1, 1);
+       case 14:
+               return SC27XX_VOLT_RATIO(68, 900);
+       case 16:
+               return SC27XX_VOLT_RATIO(48, 100);
+       case 19:
+               return SC27XX_VOLT_RATIO(1, 3);
+       default:
+               return SC27XX_VOLT_RATIO(1, 1);
+       }
+       return SC27XX_VOLT_RATIO(1, 1);
+}
+
 static int sc2731_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {

@@ -215,6 +321,34 @@ static int sc2731_adc_get_ratio(int channel, int scale)
 /*
  * According to the datasheet set specific value on some channel.
  */
+static void sc2720_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               switch (i) {
+               case 5:
+                       data->channel_scale[i] = 3;
+                       break;
+               case 7:
+               case 9:
+                       data->channel_scale[i] = 2;
+                       break;
+               case 13:
+                       data->channel_scale[i] = 1;
+                       break;
+               case 19:

drivers/iio/adc/sc27xx_adc.c +1 -0

+
 static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
 {
        int i;

drivers/iio/adc/sc27xx_adc.c +46 -0

+                       ret = regulator_set_voltage(data->volref,
+                                               SC27XX_ADC_REFVOL_VDD35,
+                                               SC27XX_ADC_REFVOL_VDD35);
+                       if (ret) {
+                               dev_err(data->dev, "failed to set the volref 3.5V\n");
+                               hwspin_unlock_raw(data->hwlock);
+                               return ret;
+                       }
+               }
+       }
+
        ret = regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CTL,
                                 SC27XX_ADC_EN, SC27XX_ADC_EN);
        if (ret)

@@ -293,6 +445,16 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
        regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CTL,
                           SC27XX_ADC_EN, 0);
 unlock_adc:
+       if (data->var_data->pmic_type == SC2721_ADC) {
+               if ((channel == 30) || (channel == 31)) {
+                       ret = regulator_set_voltage(data->volref,
+                                                   SC27XX_ADC_REFVOL_VDD28,
+                                                   SC27XX_ADC_REFVOL_VDD28);
+                       if (ret)
+                               dev_err(data->dev, "failed to set the volref 2.8V\n");
+               }
+       }
+
        hwspin_unlock_raw(data->hwlock);
 
        if (!ret)

@@ -522,6 +684,7 @@ static void sc27xx_adc_disable(void *_data)
 }
 
 static const struct sc27xx_adc_variant_data sc2731_data = {
+       .pmic_type = SC27XX_ADC,
        .module_en = SC2731_MODULE_EN,
        .clk_en = SC2731_ARM_CLK_EN,
        .scale_shift = SC27XX_ADC_SCALE_SHIFT,

@@ -532,6 +695,30 @@ static const struct sc27xx_adc_variant_data sc2731_data = {
        .get_ratio = sc2731_adc_get_ratio,
 };
 
+static const struct sc27xx_adc_variant_data sc2721_data = {
+       .pmic_type = SC2721_ADC,
+       .module_en = SC2731_MODULE_EN,
+       .clk_en = SC2721_ARM_CLK_EN,
+       .scale_shift = SC2721_ADC_SCALE_SHIFT,
+       .scale_mask = SC2721_ADC_SCALE_MASK,
+       .bscale_cal = &sc2731_big_scale_graph_calib,
+       .sscale_cal = &sc2731_small_scale_graph_calib,
+       .init_scale = sc2731_adc_scale_init,
+       .get_ratio = sc2721_adc_get_ratio,
+};
+
+static const struct sc27xx_adc_variant_data sc2720_data = {
+       .pmic_type = SC27XX_ADC,
+       .module_en = SC2731_MODULE_EN,
+       .clk_en = SC2721_ARM_CLK_EN,
+       .scale_shift = SC27XX_ADC_SCALE_SHIFT,
+       .scale_mask = SC27XX_ADC_SCALE_MASK,
+       .bscale_cal = &big_scale_graph_calib,
+       .sscale_cal = &small_scale_graph_calib,
+       .init_scale = sc2720_adc_scale_init,
+       .get_ratio = sc2720_adc_get_ratio,
+};
+
 static int sc27xx_adc_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;

drivers/iio/adc/sc27xx_adc.c +6 -1

+                       return ret;
+               }
+       }
+
        sc27xx_data->var_data = pdata;
        sc27xx_data->var_data->init_scale(sc27xx_data);
 

@@ -611,6 +807,8 @@ static int sc27xx_adc_probe(struct platform_device *pdev)
 
 static const struct of_device_id sc27xx_adc_of_match[] = {
        { .compatible = "sprd,sc2731-adc", .data = &sc2731_data},
+       { .compatible = "sprd,sc2721-adc", .data = &sc2721_data},
+       { .compatible = "sprd,sc2720-adc", .data = &sc2720_data},
        { }
 };
 MODULE_DEVICE_TABLE(of, sc27xx_adc_of_match);
--

2.25.1

Quoted 43 lines · Cixi Geng

From: Cixi Geng <[email protected]>

sc2720 and sc2721 is the product of sc27xx series.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 198 +++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)

drivers/iio/adc/sc27xx_adc.c +4 -0

index d2712e54ee79..7b5c66660ac9 100644
@@ -9,11 +9,13 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 
 /* PMIC global registers definition */
 #define SC2731_MODULE_EN               0xc08
 #define SC27XX_MODULE_ADC_EN           BIT(5)
+#define SC2721_ARM_CLK_EN              0xc0c
 #define SC2731_ARM_CLK_EN              0xc10
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)

@@ -37,7 +39,9 @@
 /* Bits and mask definition for SC27XX_ADC_CH_CFG register */
 #define SC27XX_ADC_CHN_ID_MASK         GENMASK(4, 0)
 #define SC27XX_ADC_SCALE_MASK          GENMASK(10, 9)
+#define SC2721_ADC_SCALE_MASK          BIT(5)
 #define SC27XX_ADC_SCALE_SHIFT         9
+#define SC2721_ADC_SCALE_SHIFT         5
 
 /* Bits definitions for SC27XX_ADC_INT_EN registers */
 #define SC27XX_ADC_IRQ_EN              BIT(0)

@@ -67,8 +71,21 @@
 #define SC27XX_RATIO_NUMERATOR_OFFSET  16
 #define SC27XX_RATIO_DENOMINATOR_MASK  GENMASK(15, 0)
 

drivers/iio/adc/sc27xx_adc.c line 86

Quoted 13 lines

drivers/iio/adc/sc27xx_adc.c +12 -0

+/* ADC specific channel reference voltage 3.5V */
+#define SC27XX_ADC_REFVOL_VDD35                3500000
+
+/* ADC default channel reference voltage is 2.8V */
+#define SC27XX_ADC_REFVOL_VDD28                2800000
+
+enum sc27xx_pmic_type {
+       SC27XX_ADC,
+       SC2721_ADC,
+};
+
 struct sc27xx_adc_data {
+       struct iio_dev *indio_dev;  

Why add an unused member?

Quoted 9 lines

drivers/iio/adc/sc27xx_adc.c +1 -0

        struct device *dev;
+       struct regulator *volref;
        struct regmap *regmap;
        /*
         * One hardware spinlock to synchronize between the multiple

@@ -87,6 +104,7 @@ struct sc27xx_adc_data {
  * in the device data structure.
  */

Quoted 9 lines

drivers/iio/adc/sc27xx_adc.c +1 -0

+
 static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
 {
        int i;

@@ -239,6 +373,24 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                return ret;
        }
 

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel, · line 379

Quoted 4 lines

drivers/iio/adc/sc27xx_adc.c +4 -0

+       /*
+        * According to the sc2721 chip data sheet, the reference voltage of
+        * specific channel 30 and channel 31 in ADC module needs to be set from
+        * the default 2.8v to 3.5v.

drivers/iio/adc/sc27xx_adc.c static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel, · line 382

Quoted 3 lines

drivers/iio/adc/sc27xx_adc.c +3 -0

+        */
+       if (data->var_data->pmic_type == SC2721_ADC) {
+               if ((channel == 30) || (channel == 31)) {  

Combine the two branches please.

Quoted 33 lines

drivers/iio/adc/sc27xx_adc.c +21 -0

+                       ret = regulator_set_voltage(data->volref,
+                                               SC27XX_ADC_REFVOL_VDD35,
+                                               SC27XX_ADC_REFVOL_VDD35);
+                       if (ret) {
+                               dev_err(data->dev, "failed to set the volref 3.5V\n");
+                               hwspin_unlock_raw(data->hwlock);
+                               return ret;
+                       }
+               }
+       }
+
        ret = regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CTL,
                                 SC27XX_ADC_EN, SC27XX_ADC_EN);
        if (ret)

@@ -293,6 +445,16 @@ static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
        regmap_update_bits(data->regmap, data->base + SC27XX_ADC_CTL,
                           SC27XX_ADC_EN, 0);
 unlock_adc:
+       if (data->var_data->pmic_type == SC2721_ADC) {
+               if ((channel == 30) || (channel == 31)) {
+                       ret = regulator_set_voltage(data->volref,
+                                                   SC27XX_ADC_REFVOL_VDD28,
+                                                   SC27XX_ADC_REFVOL_VDD28);
+                       if (ret)
+                               dev_err(data->dev, "failed to set the volref 2.8V\n");
+               }
+       }
+
        hwspin_unlock_raw(data->hwlock);
 
        if (!ret)

@@ -522,6 +684,7 @@ static void sc27xx_adc_disable(void *_data)
 }

From: Cixi Geng <[email protected]>

The ump9620 is variant from sc27xx chip, add it in here.

Signed-off-by Yuming Zhu <[email protected]>

Signed-off-by Cixi Geng <[email protected]>

---
 drivers/iio/adc/sc27xx_adc.c | 263 +++++++++++++++++++++++++++++++++--
 1 file changed, 254 insertions(+), 9 deletions(-)

drivers/iio/adc/sc27xx_adc.c +32 -0

index 195f44cf61e1..68b967f32498 100644
@@ -15,12 +15,16 @@
 /* PMIC global registers definition */
 #define SC2730_MODULE_EN               0x1808
 #define SC2731_MODULE_EN               0xc08
+#define UMP9620_MODULE_EN              0x2008
 #define SC27XX_MODULE_ADC_EN           BIT(5)
 #define SC2721_ARM_CLK_EN              0xc0c
 #define SC2730_ARM_CLK_EN              0x180c
 #define SC2731_ARM_CLK_EN              0xc10
+#define UMP9620_ARM_CLK_EN             0x200c
+#define UMP9620_XTL_WAIT_CTRL0         0x2378
 #define SC27XX_CLK_ADC_EN              BIT(5)
 #define SC27XX_CLK_ADC_CLK_EN          BIT(6)
+#define UMP9620_XTL_WAIT_CTRL0_EN      BIT(8)
 
 /* ADC controller registers definition */
 #define SC27XX_ADC_CTL                 0x0

@@ -82,6 +86,13 @@
 enum sc27xx_pmic_type {
        SC27XX_ADC,
        SC2721_ADC,
+       UMP9620_ADC,
+};
+
+enum ump96xx_scale_cal {
+       UMP96XX_VBAT_SENSES_CAL,
+       UMP96XX_VBAT_DET_CAL,
+       UMP96XX_CH1_CAL,
 };
 
 struct sc27xx_adc_data {

@@ -140,6 +151,11 @@ static struct sc27xx_adc_linear_graph small_scale_graph = {
        100, 341,
 };
 
+static struct sc27xx_adc_linear_graph ump9620_bat_det_graph = {
+       1400, 3482,
+       200, 476,
+};
+
 static const struct sc27xx_adc_linear_graph sc2731_big_scale_graph_calib = {
        4200, 850,
        3600, 728,

@@ -165,6 +181,33 @@ static int sc27xx_adc_get_calib_data(u32 calib_data, int calib_adc)
        return ((calib_data & 0xff) + calib_adc - 128) * 4;
 }
 
+static int adc_nvmem_cell_calib_data(struct sc27xx_adc_data *data, const char *cell_name)
+{
+       struct nvmem_cell *cell;
+       void *buf;
+       u32 calib_data = 0;
+       size_t len = 0;
+
+       if (!data)
+               return -EINVAL;
+
+       cell = nvmem_cell_get(data->dev, cell_name);
+       if (IS_ERR_OR_NULL(cell))
+               return PTR_ERR(cell);
+
+       buf = nvmem_cell_read(cell, &len);
+       if (IS_ERR_OR_NULL(buf)) {

drivers/iio/adc/sc27xx_adc.c +111 -0

+
 static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
                                        bool big_scale)
 {

@@ -207,6 +250,56 @@ static int sc27xx_adc_scale_calibration(struct sc27xx_adc_data *data,
        return 0;
 }
 
+static int ump96xx_adc_scale_cal(struct sc27xx_adc_data *data,
+                                       enum ump96xx_scale_cal cal_type)
+{
+       struct sc27xx_adc_linear_graph *graph = NULL;
+       const char *cell_name1 = NULL, *cell_name2 = NULL;
+       int adc_calib_data1 = 0, adc_calib_data2 = 0;
+
+       if (!data)
+               return -EINVAL;
+
+       if (cal_type == UMP96XX_VBAT_DET_CAL) {
+               graph = &ump9620_bat_det_graph;
+               cell_name1 = "vbat_det_cal1";
+               cell_name2 = "vbat_det_cal2";
+       } else if (cal_type == UMP96XX_VBAT_SENSES_CAL) {
+               graph = &big_scale_graph;
+               cell_name1 = "big_scale_calib1";
+               cell_name2 = "big_scale_calib2";
+       } else if (cal_type == UMP96XX_CH1_CAL) {
+               graph = &small_scale_graph;
+               cell_name1 = "small_scale_calib1";
+               cell_name2 = "small_scale_calib2";
+       } else {
+               graph = &small_scale_graph;
+               cell_name1 = "small_scale_calib1";
+               cell_name2 = "small_scale_calib2";
+       }
+
+       adc_calib_data1 = adc_nvmem_cell_calib_data(data, cell_name1);
+       if (adc_calib_data1 < 0) {
+               dev_err(data->dev, "err! %s:%d\n", cell_name1, adc_calib_data1);
+               return adc_calib_data1;
+       }
+
+       adc_calib_data2 = adc_nvmem_cell_calib_data(data, cell_name2);
+       if (adc_calib_data2 < 0) {
+               dev_err(data->dev, "err! %s:%d\n", cell_name2, adc_calib_data2);
+               return adc_calib_data2;
+       }
+
+       /*
+        *Read the data in the two blocks of efuse and convert them into the
+        *calibration value in the ump9620 adc linear graph.
+        */
+       graph->adc0 = (adc_calib_data1 & 0xfff0) >> 4;
+       graph->adc1 = (adc_calib_data2 & 0xfff0) >> 4;
+
+       return 0;
+}
+
 static int sc2720_adc_get_ratio(int channel, int scale)
 {
        switch (channel) {

@@ -394,6 +487,50 @@ static int sc2731_adc_get_ratio(int channel, int scale)
        return SC27XX_VOLT_RATIO(1, 1);
 }
 
+static int ump9620_adc_get_ratio(int channel, int scale)
+{
+       switch (channel) {
+       case 11:
+               return SC27XX_VOLT_RATIO(1, 1);
+       case 14:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(68, 900);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       case 15:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(1, 3);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       case 21:
+       case 22:
+       case 23:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(3, 8);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       default:
+               switch (scale) {
+               case 0:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               case 1:
+                       return SC27XX_VOLT_RATIO(1000, 1955);
+               case 2:
+                       return SC27XX_VOLT_RATIO(1000, 2600);
+               case 3:
+                       return SC27XX_VOLT_RATIO(1000, 4060);
+               default:
+                       return SC27XX_VOLT_RATIO(1, 1);
+               }
+       }
+}
+
 /*
  * According to the datasheet set specific value on some channel.
  */

@@ -453,6 +590,22 @@ static void sc2731_adc_scale_init(struct sc27xx_adc_data *data)
        }
 }
 
+static void ump9620_adc_scale_init(struct sc27xx_adc_data *data)
+{
+       int i;
+
+       for (i = 0; i < SC27XX_ADC_CHANNEL_MAX; i++) {
+               if (i == 10 || i == 19 || i == 30 || i == 31)
+                       data->channel_scale[i] = 3;
+               else if (i == 7 || i == 9)
+                       data->channel_scale[i] = 2;
+               else if (i == 0 || i == 13)
+                       data->channel_scale[i] = 1;
+               else
+                       data->channel_scale[i] = 0;
+       }
+}
+
 static int sc27xx_adc_read(struct sc27xx_adc_data *data, int channel,
                           int scale, int *val)
 {

@@ -578,6 +731,23 @@ static int sc27xx_adc_to_volt(struct sc27xx_adc_linear_graph *graph,
        return tmp < 0 ? 0 : tmp;