Commit ac23d64d authored by Stefan Brüns's avatar Stefan Brüns Committed by Jonathan Cameron

iio: adc: Fix bad GENMASK use, typos, whitespace

Commit 7906dd52 ("iio: ina2xx: Fix whitespace and re-order code")
changed the register number of the MASK_ENABLE register from 0x06 to the
value equivalent GENMASK(2,1), although its no mask.
Also fix a typo (INA2_6_6 instead of INA2_2_6), and use the datasheet
name ("Mask/Enable") for the register number define.
Fix bad indentation for channel attributes.
Signed-off-by: default avatarStefan Brüns <stefan.bruens@rwth-aachen.de>
Acked-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent de01d657
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#define INA2XX_CURRENT 0x04 /* readonly */ #define INA2XX_CURRENT 0x04 /* readonly */
#define INA2XX_CALIBRATION 0x05 #define INA2XX_CALIBRATION 0x05
#define INA226_ALERT_MASK GENMASK(2, 1) #define INA226_MASK_ENABLE 0x06
#define INA266_CVRF BIT(3) #define INA226_CVRF BIT(3)
#define INA2XX_MAX_REGISTERS 8 #define INA2XX_MAX_REGISTERS 8
...@@ -417,8 +417,8 @@ static ssize_t ina2xx_shunt_resistor_store(struct device *dev, ...@@ -417,8 +417,8 @@ static ssize_t ina2xx_shunt_resistor_store(struct device *dev,
.address = (_address), \ .address = (_address), \
.indexed = 1, \ .indexed = 1, \
.channel = (_index), \ .channel = (_index), \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
| BIT(IIO_CHAN_INFO_SCALE), \ BIT(IIO_CHAN_INFO_SCALE), \
.info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \ .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \
.scan_index = (_index), \ .scan_index = (_index), \
...@@ -481,12 +481,12 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev) ...@@ -481,12 +481,12 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev)
*/ */
if (!chip->allow_async_readout) if (!chip->allow_async_readout)
do { do {
ret = regmap_read(chip->regmap, INA226_ALERT_MASK, ret = regmap_read(chip->regmap, INA226_MASK_ENABLE,
&alert); &alert);
if (ret < 0) if (ret < 0)
return ret; return ret;
alert &= INA266_CVRF; alert &= INA226_CVRF;
} while (!alert); } while (!alert);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment