diff options
| author | Alexander Koch <mail@alexanderkoch.net> | 2017-01-06 11:38:17 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2017-01-10 18:15:00 +0100 |
| commit | c72eeabd0ca8291e6e8d9ec3bb93c70125445a5d (patch) | |
| tree | d61ca55f2cbf6844064d3759716245369801c5d4 /drivers/hwmon/adc128d818.c | |
| parent | hwmon: (adc128d818) Support operation modes 1-3 (diff) | |
| download | linux-c72eeabd0ca8291e6e8d9ec3bb93c70125445a5d.tar.xz linux-c72eeabd0ca8291e6e8d9ec3bb93c70125445a5d.zip | |
hwmon: (adc128d818) Preserve operation mode
Preserve chip operation mode if no mode is specified via devicetree. This
enables operation when chip configuration is done by BIOS/ROMMON.
Signed-off-by: Alexander Koch <mail@alexanderkoch.net>
Acked-by: Michael Hornung <mhornung.linux@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/adc128d818.c')
| -rw-r--r-- | drivers/hwmon/adc128d818.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/adc128d818.c b/drivers/hwmon/adc128d818.c index 0502af963f73..bbe3a5c5b3f5 100644 --- a/drivers/hwmon/adc128d818.c +++ b/drivers/hwmon/adc128d818.c @@ -491,7 +491,7 @@ static int adc128_probe(struct i2c_client *client, data->vref = 2560; /* 2.56V, in mV */ } - /* Operation mode is optional and defaults to mode 0 */ + /* Operation mode is optional. If unspecified, keep current mode */ if (of_property_read_u8(dev->of_node, "ti,mode", &data->mode) == 0) { if (data->mode > 3) { dev_err(dev, "invalid operation mode %d\n", @@ -500,7 +500,10 @@ static int adc128_probe(struct i2c_client *client, goto error; } } else { - data->mode = 0; + err = i2c_smbus_read_byte_data(client, ADC128_REG_CONFIG_ADV); + if (err < 0) + goto error; + data->mode = (err >> 1) & ADC128_REG_MASK; } data->client = client; |