| Message ID | 20200426110256.218186-4-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
| Series | [1/8] iio: light: cm32181: Add some extra register defines | expand |
On Sun, Apr 26, 2020 at 2:03 PM Hans de Goede <hdegoede@redhat.com> wrote: > > This is a preparation patch for reading some ACPI tables which give > init values for multiple registers. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/iio/light/cm32181.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c > index e8be20d3902c..e31c1005b03d 100644 > --- a/drivers/iio/light/cm32181.c > +++ b/drivers/iio/light/cm32181.c > @@ -26,7 +26,7 @@ > #define CM32181_REG_ADDR_ID 0x07 > > /* Number of Configurable Registers */ > -#define CM32181_CONF_REG_NUM 0x01 > +#define CM32181_CONF_REG_NUM 4 > > /* CMD register */ > #define CM32181_CMD_ALS_DISABLE BIT(0) > @@ -53,10 +53,6 @@ > > #define SMBUS_ALERT_RESPONSE_ADDRESS 0x0c > > -static const u8 cm32181_reg[CM32181_CONF_REG_NUM] = { > - CM32181_REG_ADDR_CMD, > -}; > - > /* CM3218 Family */ > static const int cm3218_als_it_bits[] = { 0, 1, 2, 3 }; > static const int cm3218_als_it_values[] = { 100000, 200000, 400000, 800000 }; > @@ -71,6 +67,7 @@ struct cm32181_chip { > struct i2c_client *client; > struct mutex lock; > u16 conf_regs[CM32181_CONF_REG_NUM]; > + int init_regs_bitmap; unsigned long > int calibscale; > int num_als_it; > const int *als_it_bits; > @@ -117,14 +114,17 @@ static int cm32181_reg_init(struct cm32181_chip *cm32181) > /* Default Values */ > cm32181->conf_regs[CM32181_REG_ADDR_CMD] = > CM32181_CMD_ALS_IT_DEFAULT | CM32181_CMD_ALS_SM_DEFAULT; > + cm32181->init_regs_bitmap = BIT(CM32181_REG_ADDR_CMD); > cm32181->calibscale = CM32181_CALIBSCALE_DEFAULT; > > /* Initialize registers*/ > for (i = 0; i < CM32181_CONF_REG_NUM; i++) { > - ret = i2c_smbus_write_word_data(client, cm32181_reg[i], > - cm32181->conf_regs[i]); > - if (ret < 0) > - return ret; > + if (cm32181->init_regs_bitmap & BIT(i)) { for_each_set_bit() > + ret = i2c_smbus_write_word_data(client, i, > + cm32181->conf_regs[i]); > + if (ret < 0) > + return ret; > + } > } > > return 0; > -- > 2.26.0 >
diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c index e8be20d3902c..e31c1005b03d 100644 --- a/drivers/iio/light/cm32181.c +++ b/drivers/iio/light/cm32181.c @@ -26,7 +26,7 @@ #define CM32181_REG_ADDR_ID 0x07 /* Number of Configurable Registers */ -#define CM32181_CONF_REG_NUM 0x01 +#define CM32181_CONF_REG_NUM 4 /* CMD register */ #define CM32181_CMD_ALS_DISABLE BIT(0) @@ -53,10 +53,6 @@ #define SMBUS_ALERT_RESPONSE_ADDRESS 0x0c -static const u8 cm32181_reg[CM32181_CONF_REG_NUM] = { - CM32181_REG_ADDR_CMD, -}; - /* CM3218 Family */ static const int cm3218_als_it_bits[] = { 0, 1, 2, 3 }; static const int cm3218_als_it_values[] = { 100000, 200000, 400000, 800000 }; @@ -71,6 +67,7 @@ struct cm32181_chip { struct i2c_client *client; struct mutex lock; u16 conf_regs[CM32181_CONF_REG_NUM]; + int init_regs_bitmap; int calibscale; int num_als_it; const int *als_it_bits; @@ -117,14 +114,17 @@ static int cm32181_reg_init(struct cm32181_chip *cm32181) /* Default Values */ cm32181->conf_regs[CM32181_REG_ADDR_CMD] = CM32181_CMD_ALS_IT_DEFAULT | CM32181_CMD_ALS_SM_DEFAULT; + cm32181->init_regs_bitmap = BIT(CM32181_REG_ADDR_CMD); cm32181->calibscale = CM32181_CALIBSCALE_DEFAULT; /* Initialize registers*/ for (i = 0; i < CM32181_CONF_REG_NUM; i++) { - ret = i2c_smbus_write_word_data(client, cm32181_reg[i], - cm32181->conf_regs[i]); - if (ret < 0) - return ret; + if (cm32181->init_regs_bitmap & BIT(i)) { + ret = i2c_smbus_write_word_data(client, i, + cm32181->conf_regs[i]); + if (ret < 0) + return ret; + } } return 0;
This is a preparation patch for reading some ACPI tables which give init values for multiple registers. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/iio/light/cm32181.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)