]> git.itanic.dy.fi Git - linux-stable/commitdiff
iio: adc: mcp3911: use correct formula for AD conversion
authorMarcus Folkesson <marcus.folkesson@gmail.com>
Fri, 22 Jul 2022 13:07:20 +0000 (15:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 15 Sep 2022 10:04:51 +0000 (12:04 +0200)
commit 9e2238e3ae40d371a1130226e0e740aa1601efa6 upstream.

The ADC conversion is actually not rail-to-rail but with a factor 1.5.
Make use of this factor when calculating actual voltage.

Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220722130726.7627-4-marcus.folkesson@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/mcp3911.c

index 624ec5b075e5a8ddc65f53a31057c2049951382e..4e2e8e819b1e7c053c4d7123e40ef9ba12d01015 100644 (file)
@@ -38,8 +38,8 @@
 #define MCP3911_CHANNEL(x)             (MCP3911_REG_CHANNEL0 + x * 3)
 #define MCP3911_OFFCAL(x)              (MCP3911_REG_OFFCAL_CH0 + x * 6)
 
-/* Internal voltage reference in uV */
-#define MCP3911_INT_VREF_UV            1200000
+/* Internal voltage reference in mV */
+#define MCP3911_INT_VREF_MV            1200
 
 #define MCP3911_REG_READ(reg, id)      ((((reg) << 1) | ((id) << 5) | (1 << 0)) & 0xff)
 #define MCP3911_REG_WRITE(reg, id)     ((((reg) << 1) | ((id) << 5) | (0 << 0)) & 0xff)
@@ -137,11 +137,18 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev,
 
                        *val = ret / 1000;
                } else {
-                       *val = MCP3911_INT_VREF_UV;
+                       *val = MCP3911_INT_VREF_MV;
                }
 
-               *val2 = 24;
-               ret = IIO_VAL_FRACTIONAL_LOG2;
+               /*
+                * For 24bit Conversion
+                * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5
+                * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5)
+                */
+
+               /* val2 = (2^23 * 1.5) */
+               *val2 = 12582912;
+               ret = IIO_VAL_FRACTIONAL;
                break;
        }