iio:proximity:sx9324: Add dt_binding support
authorGwendal Grignou <gwendal@chromium.org>
Sat, 1 Jan 2022 20:38:17 +0000 (12:38 -0800)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 23 Jan 2022 18:03:33 +0000 (18:03 +0000)
Based on bindings/iio/proximity/semtech,sx9324.yaml, implement
retrieving sensor hardware property and alter default values.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20220101203817.290512-6-gwendal@chromium.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/proximity/sx9324.c

index 3aeb34b..0d9bbbb 100644 (file)
@@ -77,6 +77,7 @@
 #define SX9324_REG_PROX_CTRL0          0x30
 #define SX9324_REG_PROX_CTRL0_GAIN_MASK        GENMASK(5, 3)
 #define SX9324_REG_PROX_CTRL0_GAIN_1           0x80
+#define SX9324_REG_PROX_CTRL0_RAWFILT_MASK     GENMASK(2, 0)
 #define SX9324_REG_PROX_CTRL0_RAWFILT_1P50     0x01
 #define SX9324_REG_PROX_CTRL1          0x31
 #define SX9324_REG_PROX_CTRL2          0x32
@@ -753,6 +754,74 @@ static int sx9324_write_raw(struct iio_dev *indio_dev,
        }
 }
 
+static const struct sx_common_reg_default sx9324_default_regs[] = {
+       { SX9324_REG_IRQ_MSK, 0x00 },
+       { SX9324_REG_IRQ_CFG0, 0x00 },
+       { SX9324_REG_IRQ_CFG1, SX9324_REG_IRQ_CFG1_FAILCOND },
+       { SX9324_REG_IRQ_CFG2, 0x00 },
+       { SX9324_REG_GNRL_CTRL0, SX9324_REG_GNRL_CTRL0_SCANPERIOD_100MS },
+       /*
+        * The lower 4 bits should not be set as it enable sensors measurements.
+        * Turning the detection on before the configuration values are set to
+        * good values can cause the device to return erroneous readings.
+        */
+       { SX9324_REG_GNRL_CTRL1, SX9324_REG_GNRL_CTRL1_PAUSECTRL },
+
+       { SX9324_REG_AFE_CTRL0, 0x00 },
+       { SX9324_REG_AFE_CTRL3, 0x00 },
+       { SX9324_REG_AFE_CTRL4, SX9324_REG_AFE_CTRL4_FREQ_83_33HZ |
+               SX9324_REG_AFE_CTRL4_RES_100 },
+       { SX9324_REG_AFE_CTRL6, 0x00 },
+       { SX9324_REG_AFE_CTRL7, SX9324_REG_AFE_CTRL4_FREQ_83_33HZ |
+               SX9324_REG_AFE_CTRL4_RES_100 },
+
+       /* TODO(gwendal): PHx use chip default or all grounded? */
+       { SX9324_REG_AFE_PH0, 0x29 },
+       { SX9324_REG_AFE_PH1, 0x26 },
+       { SX9324_REG_AFE_PH2, 0x1a },
+       { SX9324_REG_AFE_PH3, 0x16 },
+
+       { SX9324_REG_AFE_CTRL8, SX9324_REG_AFE_CTRL8_RESFILTN_4KOHM },
+       { SX9324_REG_AFE_CTRL9, SX9324_REG_AFE_CTRL9_AGAIN_1 },
+
+       { SX9324_REG_PROX_CTRL0, SX9324_REG_PROX_CTRL0_GAIN_1 |
+               SX9324_REG_PROX_CTRL0_RAWFILT_1P50 },
+       { SX9324_REG_PROX_CTRL1, SX9324_REG_PROX_CTRL0_GAIN_1 |
+               SX9324_REG_PROX_CTRL0_RAWFILT_1P50 },
+       { SX9324_REG_PROX_CTRL2, SX9324_REG_PROX_CTRL2_AVGNEG_THRESH_16K },
+       { 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_CTRL5, 0x00 },
+       { SX9324_REG_PROX_CTRL6, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 },
+       { SX9324_REG_PROX_CTRL7, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 },
+       { SX9324_REG_ADV_CTRL0, 0x00 },
+       { SX9324_REG_ADV_CTRL1, 0x00 },
+       { SX9324_REG_ADV_CTRL2, 0x00 },
+       { SX9324_REG_ADV_CTRL3, 0x00 },
+       { SX9324_REG_ADV_CTRL4, 0x00 },
+       { SX9324_REG_ADV_CTRL5, SX9324_REG_ADV_CTRL5_STARTUP_SENSOR_1 |
+               SX9324_REG_ADV_CTRL5_STARTUP_METHOD_1 },
+       { SX9324_REG_ADV_CTRL6, 0x00 },
+       { SX9324_REG_ADV_CTRL7, 0x00 },
+       { SX9324_REG_ADV_CTRL8, 0x00 },
+       { SX9324_REG_ADV_CTRL9, 0x00 },
+       /* Body/Table threshold */
+       { SX9324_REG_ADV_CTRL10, 0x00 },
+       { SX9324_REG_ADV_CTRL11, 0x00 },
+       { SX9324_REG_ADV_CTRL12, 0x00 },
+       /* TODO(gwendal): SAR currenly disabled */
+       { SX9324_REG_ADV_CTRL13, 0x00 },
+       { SX9324_REG_ADV_CTRL14, 0x00 },
+       { SX9324_REG_ADV_CTRL15, 0x00 },
+       { SX9324_REG_ADV_CTRL16, 0x00 },
+       { SX9324_REG_ADV_CTRL17, 0x00 },
+       { SX9324_REG_ADV_CTRL18, 0x00 },
+       { SX9324_REG_ADV_CTRL19, SX9324_REG_ADV_CTRL19_HIGHT_FAILURE_THRESH_SATURATION },
+       { SX9324_REG_ADV_CTRL20, SX9324_REG_ADV_CTRL19_HIGHT_FAILURE_THRESH_SATURATION },
+};
+
 /* Activate all channels and perform an initial compensation. */
 static int sx9324_init_compensation(struct iio_dev *indio_dev)
 {
@@ -772,6 +841,99 @@ static int sx9324_init_compensation(struct iio_dev *indio_dev)
                                        20000, 2000000);
 }
 
+static const struct sx_common_reg_default *
+sx9324_get_default_reg(struct device *dev, int idx,
+                      struct sx_common_reg_default *reg_def)
+{
+#define SX9324_PIN_DEF "semtech,ph0-pin"
+#define SX9324_RESOLUTION_DEF "semtech,ph01-resolution"
+#define SX9324_PROXRAW_DEF "semtech,ph01-proxraw-strength"
+       unsigned int pin_defs[SX9324_NUM_PINS];
+       char prop[] = SX9324_PROXRAW_DEF;
+       u32 start = 0, raw = 0, pos = 0;
+       int ret, count, ph, pin;
+
+       memcpy(reg_def, &sx9324_default_regs[idx], sizeof(*reg_def));
+       switch (reg_def->reg) {
+       case SX9324_REG_AFE_PH0:
+       case SX9324_REG_AFE_PH1:
+       case SX9324_REG_AFE_PH2:
+       case SX9324_REG_AFE_PH3:
+               ph = reg_def->reg - SX9324_REG_AFE_PH0;
+               scnprintf(prop, ARRAY_SIZE(prop), "semtech,ph%d-pin", ph);
+
+               count = device_property_count_u32(dev, prop);
+               if (count != ARRAY_SIZE(pin_defs))
+                       break;
+               ret = device_property_read_u32_array(dev, prop, pin_defs,
+                                                    ARRAY_SIZE(pin_defs));
+               for (pin = 0; pin < SX9324_NUM_PINS; pin++)
+                       raw |= (pin_defs[pin] << (2 * pin)) &
+                              SX9324_REG_AFE_PH0_PIN_MASK(pin);
+               reg_def->def = raw;
+               break;
+       case SX9324_REG_AFE_CTRL4:
+       case SX9324_REG_AFE_CTRL7:
+               if (reg_def->reg == SX9324_REG_AFE_CTRL4)
+                       strncpy(prop, "semtech,ph01-resolution",
+                               ARRAY_SIZE(prop));
+               else
+                       strncpy(prop, "semtech,ph23-resolution",
+                               ARRAY_SIZE(prop));
+
+               ret = device_property_read_u32(dev, prop, &raw);
+               if (ret)
+                       break;
+
+               raw = ilog2(raw) - 3;
+
+               reg_def->def &= ~SX9324_REG_AFE_CTRL4_RESOLUTION_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_AFE_CTRL4_RESOLUTION_MASK,
+                                          raw);
+               break;
+       case SX9324_REG_ADV_CTRL5:
+               ret = device_property_read_u32(dev, "semtech,startup-sensor",
+                                              &start);
+               if (ret)
+                       break;
+
+               reg_def->def &= ~SX9324_REG_ADV_CTRL5_STARTUPSENS_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_ADV_CTRL5_STARTUPSENS_MASK,
+                                          start);
+               break;
+       case SX9324_REG_PROX_CTRL4:
+               ret = device_property_read_u32(dev, "semtech,avg-pos-strength",
+                                              &pos);
+               if (ret)
+                       break;
+
+               /* Powers of 2, except for a gap between 16 and 64 */
+               raw = clamp(ilog2(pos), 3, 11) - (pos >= 32 ? 4 : 3);
+
+               reg_def->def &= ~SX9324_REG_PROX_CTRL4_AVGPOSFILT_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_PROX_CTRL4_AVGPOSFILT_MASK,
+                                          raw);
+               break;
+       case SX9324_REG_PROX_CTRL0:
+       case SX9324_REG_PROX_CTRL1:
+               if (reg_def->reg == SX9324_REG_PROX_CTRL0)
+                       strncpy(prop, "semtech,ph01-proxraw-strength",
+                               ARRAY_SIZE(prop));
+               else
+                       strncpy(prop, "semtech,ph23-proxraw-strength",
+                               ARRAY_SIZE(prop));
+               ret = device_property_read_u32(dev, prop, &raw);
+               if (ret)
+                       break;
+
+               reg_def->def &= ~SX9324_REG_PROX_CTRL0_RAWFILT_MASK;
+               reg_def->def |= FIELD_PREP(SX9324_REG_PROX_CTRL0_RAWFILT_MASK,
+                                          raw);
+               break;
+       }
+       return reg_def;
+}
+
 static int sx9324_check_whoami(struct device *dev,
                               struct iio_dev *indio_dev)
 {
@@ -792,12 +954,14 @@ static const struct sx_common_chip_info sx9324_chip_info = {
        .mask_enable_chan = SX9324_REG_GNRL_CTRL1_PHEN_MASK,
        .irq_msk_offset = 3,
        .num_channels = SX9324_NUM_CHANNELS,
+       .num_default_regs = ARRAY_SIZE(sx9324_default_regs),
 
        .ops = {
                .read_prox_data = sx9324_read_prox_data,
                .check_whoami = sx9324_check_whoami,
                .init_compensation = sx9324_init_compensation,
                .wait_for_sample = sx9324_wait_for_sample,
+               .get_default_reg = sx9324_get_default_reg,
        },
 
        .iio_channels = sx9324_channels,