Merge tag 'iio-for-5.20a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[platform/kernel/linux-starfive.git] / drivers / iio / proximity / sx9324.c

diff --git a/drivers/iio/proximity/sx9324.c b/drivers/iio/proximity/sx9324.c
index 63fbcaa..edb5a2c 100644 (file)
--- a/drivers/iio/proximity/sx9324.c
+++ b/drivers/iio/proximity/sx9324.c
@@ -52,6 +52,16 @@
 #define SX9324_REG_CLK_SPRD            0x15
 
 #define SX9324_REG_AFE_CTRL0           0x20
+#define SX9324_REG_AFE_CTRL0_RINT_SHIFT                6
+#define SX9324_REG_AFE_CTRL0_RINT_MASK \
+       GENMASK(SX9324_REG_AFE_CTRL0_RINT_SHIFT + 1, \
+               SX9324_REG_AFE_CTRL0_RINT_SHIFT)
+#define SX9324_REG_AFE_CTRL0_RINT_LOWEST       0x00
+#define SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT      4
+#define SX9324_REG_AFE_CTRL0_CSIDLE_MASK \
+       GENMASK(SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT + 1, \
+               SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT)
+#define SX9324_REG_AFE_CTRL0_RINT_LOWEST       0x00
 #define SX9324_REG_AFE_CTRL1           0x21
 #define SX9324_REG_AFE_CTRL2           0x22
 #define SX9324_REG_AFE_CTRL3           0x23
@@ -72,7 +82,9 @@
 #define SX9324_REG_AFE_CTRL8           0x2c
 #define SX9324_REG_AFE_CTRL8_RESERVED  0x10
 #define SX9324_REG_AFE_CTRL8_RESFILTIN_4KOHM 0x02
+#define SX9324_REG_AFE_CTRL8_RESFILTIN_MASK GENMASK(3, 0)
 #define SX9324_REG_AFE_CTRL9           0x2d
+#define SX9324_REG_AFE_CTRL9_AGAIN_MASK                        GENMASK(3, 0)
 #define SX9324_REG_AFE_CTRL9_AGAIN_1   0x08
 
 #define SX9324_REG_PROX_CTRL0          0x30
@@ -93,7 +105,7 @@
 #define SX9324_REG_PROX_CTRL4_AVGNEGFILT_MASK  GENMASK(5, 3)
 #define SX9324_REG_PROX_CTRL4_AVGNEG_FILT_2 0x08
 #define SX9324_REG_PROX_CTRL4_AVGPOSFILT_MASK  GENMASK(2, 0)
-#define SX9324_REG_PROX_CTRL3_AVGPOS_FILT_256 0x04
+#define SX9324_REG_PROX_CTRL4_AVGPOS_FILT_256 0x04
 #define SX9324_REG_PROX_CTRL5          0x35
 #define SX9324_REG_PROX_CTRL5_HYST_MASK                        GENMASK(5, 4)
 #define SX9324_REG_PROX_CTRL5_CLOSE_DEBOUNCE_MASK      GENMASK(3, 2)
@@ -782,7 +794,7 @@ static const struct sx_common_reg_default sx9324_default_regs[] = {
         */
        { SX9324_REG_GNRL_CTRL1, SX9324_REG_GNRL_CTRL1_PAUSECTRL },
 
-       { SX9324_REG_AFE_CTRL0, 0x00 },
+       { SX9324_REG_AFE_CTRL0, SX9324_REG_AFE_CTRL0_RINT_LOWEST },
        { SX9324_REG_AFE_CTRL3, 0x00 },
        { SX9324_REG_AFE_CTRL4, SX9324_REG_AFE_CTRL4_FREQ_83_33HZ |
                SX9324_REG_AFE_CTRL4_RES_100 },
@@ -810,7 +822,7 @@ static const struct sx_common_reg_default sx9324_default_regs[] = {
        { SX9324_REG_PROX_CTRL3, SX9324_REG_PROX_CTRL3_AVGDEB_2SAMPLES |
                SX9324_REG_PROX_CTRL3_AVGPOS_THRESH_16K },
        { SX9324_REG_PROX_CTRL4, SX9324_REG_PROX_CTRL4_AVGNEG_FILT_2 |
-               SX9324_REG_PROX_CTRL3_AVGPOS_FILT_256 },
+               SX9324_REG_PROX_CTRL4_AVGPOS_FILT_256 },
        { SX9324_REG_PROX_CTRL5, 0x00 },
        { SX9324_REG_PROX_CTRL6, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 },
        { SX9324_REG_PROX_CTRL7, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 },
@@ -863,6 +875,10 @@ static const struct sx_common_reg_default *
 sx9324_get_default_reg(struct device *dev, int idx,
                       struct sx_common_reg_default *reg_def)
 {
+       static const char * const sx9324_rints[] = { "lowest", "low", "high",
+               "highest" };
+       static const char * const sx9324_csidle[] = { "hi-z", "hi-z", "gnd",
+               "vdd" };
 #define SX9324_PIN_DEF "semtech,ph0-pin"
 #define SX9324_RESOLUTION_DEF "semtech,ph01-resolution"
 #define SX9324_PROXRAW_DEF "semtech,ph01-proxraw-strength"
@@ -870,6 +886,7 @@ sx9324_get_default_reg(struct device *dev, int idx,
        char prop[] = SX9324_PROXRAW_DEF;
        u32 start = 0, raw = 0, pos = 0;
        int ret, count, ph, pin;
+       const char *res;
 
        memcpy(reg_def, &sx9324_default_regs[idx], sizeof(*reg_def));
        switch (reg_def->reg) {
@@ -893,6 +910,26 @@ sx9324_get_default_reg(struct device *dev, int idx,
                               SX9324_REG_AFE_PH0_PIN_MASK(pin);
                reg_def->def = raw;
                break;
+       case SX9324_REG_AFE_CTRL0:
+               ret = device_property_read_string(dev,
+                               "semtech,cs-idle-sleep", &res);
+               if (!ret)
+                       ret = match_string(sx9324_csidle, ARRAY_SIZE(sx9324_csidle), res);
+               if (ret >= 0) {
+                       reg_def->def &= ~SX9324_REG_AFE_CTRL0_CSIDLE_MASK;
+                       reg_def->def |= ret << SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT;
+               }
+
+               ret = device_property_read_string(dev,
+                               "semtech,int-comp-resistor", &res);
+               if (ret)
+                       break;
+               ret = match_string(sx9324_rints, ARRAY_SIZE(sx9324_rints), res);
+               if (ret < 0)
+                       break;
+               reg_def->def &= ~SX9324_REG_AFE_CTRL0_RINT_MASK;
+               reg_def->def |= ret << SX9324_REG_AFE_CTRL0_RINT_SHIFT;
+               break;
        case SX9324_REG_AFE_CTRL4:
        case SX9324_REG_AFE_CTRL7:
                if (reg_def->reg == SX9324_REG_AFE_CTRL4)
@@ -912,6 +949,39 @@ sx9324_get_default_reg(struct device *dev, int idx,
                reg_def->def |= FIELD_PREP(SX9324_REG_AFE_CTRL4_RESOLUTION_MASK,
                                           raw);
                break;
+       case SX9324_REG_AFE_CTRL8:
+               ret = device_property_read_u32(dev,
+                               "semtech,input-precharge-resistor-ohms",
+                               &raw);
+               if (ret)
+                       break;
+
+               reg_def->def &= ~SX9324_REG_AFE_CTRL8_RESFILTIN_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_AFE_CTRL8_RESFILTIN_MASK,
+                                          raw / 2000);
+               break;
+
+       case SX9324_REG_AFE_CTRL9:
+               ret = device_property_read_u32(dev,
+                               "semtech,input-analog-gain", &raw);
+               if (ret)
+                       break;
+               /*
+                * The analog gain has the following setting:
+                * +---------+----------------+----------------+
+                * | dt(raw) | physical value | register value |
+                * +---------+----------------+----------------+
+                * |  0      |      x1.247    |      6         |
+                * |  1      |      x1        |      8         |
+                * |  2      |      x0.768    |     11         |
+                * |  3      |      x0.552    |     15         |
+                * +---------+----------------+----------------+
+                */
+               reg_def->def &= ~SX9324_REG_AFE_CTRL9_AGAIN_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_AFE_CTRL9_AGAIN_MASK,
+                                          6 + raw * (raw + 3) / 2);
+               break;
+
        case SX9324_REG_ADV_CTRL5:
                ret = device_property_read_u32(dev, "semtech,startup-sensor",
                                               &start);