@@ -20,6 +20,7 @@
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/pm.h>
+#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
@@ -1215,31 +1216,42 @@ static int sx9310_init_compensation(struct iio_dev *indio_dev)
}
static const struct sx9310_reg_default *
-sx9310_get_default_reg(struct sx9310_data *data, int i,
+sx9310_get_default_reg(struct device *dev, int i,
struct sx9310_reg_default *reg_def)
{
- int ret;
- const struct device_node *np = data->client->dev.of_node;
+ int ret, count;
u32 combined[SX9310_NUM_CHANNELS] = { 4, 4, 4, 4 };
unsigned long comb_mask = 0;
const char *res;
u32 start = 0, raw = 0, pos = 0;
memcpy(reg_def, &sx9310_default_regs[i], sizeof(*reg_def));
- if (!np)
- return reg_def;
-
switch (reg_def->reg) {
case SX9310_REG_PROX_CTRL2:
- if (of_property_read_bool(np, "semtech,cs0-ground")) {
+ if (device_property_read_bool(dev, "semtech,cs0-ground")) {
reg_def->def &= ~SX9310_REG_PROX_CTRL2_SHIELDEN_MASK;
reg_def->def |= SX9310_REG_PROX_CTRL2_SHIELDEN_GROUND;
}
reg_def->def &= ~SX9310_REG_PROX_CTRL2_COMBMODE_MASK;
- of_property_read_u32_array(np, "semtech,combined-sensors",
- combined, ARRAY_SIZE(combined));
- for (i = 0; i < ARRAY_SIZE(combined); i++) {
+ count = device_property_count_u32(dev, "semtech,combined-sensors");
+ if (count > 0 && count <= ARRAY_SIZE(combined))
+ ret = device_property_read_u32_array(dev,
+ "semtech,combined-sensors", combined,
+ count);
+ else
+ ret = -EINVAL;
+ if (ret) {
+ /*
+ * Either the property does not exist in the DT, the
+ * number of entries is incorrect, or we could not read
+ * the array (invalid DT).
+ * In all cases, use the default from the diver.
+ */
+ count = ARRAY_SIZE(combined);
+ }
+
+ for (i = 0; i < count; i++) {
if (combined[i] <= SX9310_NUM_CHANNELS)
comb_mask |= BIT(combined[i]);
}
@@ -1256,7 +1268,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
break;
case SX9310_REG_PROX_CTRL4:
- ret = of_property_read_string(np, "semtech,resolution", &res);
+ ret = device_property_read_string(dev, "semtech,resolution", &res);
if (ret)
break;
@@ -1280,7 +1292,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
break;
case SX9310_REG_PROX_CTRL5:
- ret = of_property_read_u32(np, "semtech,startup-sensor", &start);
+ ret = device_property_read_u32(dev, "semtech,startup-sensor", &start);
if (ret) {
start = FIELD_GET(SX9310_REG_PROX_CTRL5_STARTUPSENS_MASK,
reg_def->def);
@@ -1290,7 +1302,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
reg_def->def |= FIELD_PREP(SX9310_REG_PROX_CTRL5_STARTUPSENS_MASK,
start);
- ret = of_property_read_u32(np, "semtech,proxraw-strength", &raw);
+ ret = device_property_read_u32(dev, "semtech,proxraw-strength", &raw);
if (ret) {
raw = FIELD_GET(SX9310_REG_PROX_CTRL5_RAWFILT_MASK,
reg_def->def);
@@ -1303,7 +1315,7 @@ sx9310_get_default_reg(struct sx9310_data *data, int i,
raw);
break;
case SX9310_REG_PROX_CTRL7:
- ret = of_property_read_u32(np, "semtech,avg-pos-strength", &pos);
+ ret = device_property_read_u32(dev, "semtech,avg-pos-strength", &pos);
if (ret)
break;
@@ -1339,7 +1351,7 @@ static int sx9310_init_device(struct iio_dev *indio_dev)
/* Program some sane defaults. */
for (i = 0; i < ARRAY_SIZE(sx9310_default_regs); i++) {
- initval = sx9310_get_default_reg(data, i, &tmp);
+ initval = sx9310_get_default_reg(&indio_dev->dev, i, &tmp);
ret = regmap_write(data->regmap, initval->reg, initval->def);
if (ret)
return ret;
Use device_property_read_... to support both device tree and ACPI bindings. Given |semtech,combined-sensors| is a variable array, use device_property_count to get the length of the array first before reading it to avoid underflow errors. Add support for variable array per documentation ("iio/proximity/semtech,sx9310.yaml"). Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> --- Changes since v2: Add comment how the default array is used. Add comment in commit message to indicate this CL fix an issue with existing use of of_property_read_u32_array() when reading a variale length array. Changes since v1: Use device_property_count_u32(...) instead of device_property_read_u32_array(..., NULL, 0) drivers/iio/proximity/sx9310.c | 42 ++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 15 deletions(-)