On 02/05/17 21:06, Andrew F. Davis wrote:
> On 05/01/2017 06:19 AM, Stefan Brüns wrote:
>> Commit 7906dd52c5a0 ("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: Stefan Brüns <stefan.bruens@xxxxxxxxxxxxxx>
>> ---
>
> Good catches,
>
> Acked-by: Andrew F. Davis <afd@xxxxxx>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
>
>> drivers/iio/adc/ina2xx-adc.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
>> index 3263231276ca..f395101d68d7 100644
>> --- a/drivers/iio/adc/ina2xx-adc.c
>> +++ b/drivers/iio/adc/ina2xx-adc.c
>> @@ -41,8 +41,8 @@
>> #define INA2XX_CURRENT 0x04 /* readonly */
>> #define INA2XX_CALIBRATION 0x05
>>
>> -#define INA226_ALERT_MASK GENMASK(2, 1)
>> -#define INA266_CVRF BIT(3)
>> +#define INA226_MASK_ENABLE 0x06
>> +#define INA226_CVRF BIT(3)
>>
>> #define INA2XX_MAX_REGISTERS 8
>>
>> @@ -416,8 +416,8 @@ static ssize_t ina2xx_shunt_resistor_store(struct device *dev,
>> .address = (_address), \
>> .indexed = 1, \
>> .channel = (_index), \
>> - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \
>> - | BIT(IIO_CHAN_INFO_SCALE), \
>> + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
>> + BIT(IIO_CHAN_INFO_SCALE), \
>> .info_mask_shared_by_dir = BIT(IIO_CHAN_INFO_SAMP_FREQ) | \
>> BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \
>> .scan_index = (_index), \
>> @@ -480,12 +480,12 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev)
>> */
>> if (!chip->allow_async_readout)
>> do {
>> - ret = regmap_read(chip->regmap, INA226_ALERT_MASK,
>> + ret = regmap_read(chip->regmap, INA226_MASK_ENABLE,
>> &alert);
>> if (ret < 0)
>> return ret;
>>
>> - alert &= INA266_CVRF;
>> + alert &= INA226_CVRF;
>> } while (!alert);
>>
>> /*
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
