lkml.org 
[lkml]   [2015]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 048/165] iio:adc:mcp3422 Fix incorrect scales table
    Date
    3.16.7-ckt9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Angelo Compagnucci <angelo.compagnucci@gmail.com>

    commit 9e128ced3851d2802b6db870f6b2e93f449ce013 upstream.

    This patch fixes uncorrect order of mcp3422_scales table, the values
    was erroneously transposed.
    It removes also an unused array and a wrong comment.

    Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/iio/adc/mcp3422.c | 17 ++++-------------
    1 file changed, 4 insertions(+), 13 deletions(-)

    diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
    index 51672256072b..b96c636470ef 100644
    --- a/drivers/iio/adc/mcp3422.c
    +++ b/drivers/iio/adc/mcp3422.c
    @@ -58,20 +58,11 @@
    .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
    }

    -/* LSB is in nV to eliminate floating point */
    -static const u32 rates_to_lsb[] = {1000000, 250000, 62500, 15625};
    -
    -/*
    - * scales calculated as:
    - * rates_to_lsb[sample_rate] / (1 << pga);
    - * pga is 1 for 0, 2
    - */
    -
    static const int mcp3422_scales[4][4] = {
    - { 1000000, 250000, 62500, 15625 },
    - { 500000 , 125000, 31250, 7812 },
    - { 250000 , 62500 , 15625, 3906 },
    - { 125000 , 31250 , 7812 , 1953 } };
    + { 1000000, 500000, 250000, 125000 },
    + { 250000 , 125000, 62500 , 31250 },
    + { 62500 , 31250 , 15625 , 7812 },
    + { 15625 , 7812 , 3906 , 1953 } };

    /* Constant msleep times for data acquisitions */
    static const int mcp3422_read_times[4] = {

    \
     
     \ /
      Last update: 2015-03-25 15:41    [W:2.675 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site