From patchwork Fri Mar 18 20:48:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12785923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F29CC433EF for ; Fri, 18 Mar 2022 20:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240756AbiCRUtc (ORCPT ); Fri, 18 Mar 2022 16:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235895AbiCRUta (ORCPT ); Fri, 18 Mar 2022 16:49:30 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D27D82DA81 for ; Fri, 18 Mar 2022 13:48:10 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id v4so8329766pjh.2 for ; Fri, 18 Mar 2022 13:48:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IlaK0t4nYOfCA2Y4/D2tkqvIvLXiGsDErm7SK3XkjdI=; b=YW1UFGORv7nwfPoJeSq8/bAy761PKFzY4o8x/ukhrrdfAd70YcmqykzD1dDlmfrqOx +hNruCzt2jjDuT12pTcLxfQIJmBPl8CZYNC6YcBkR/FQYj5Dc6/hRc2IgLZxbYT+KBZz ZK4cYe8tIwZ/2K2aL/cvTxR+3qefHeWWdGKTs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IlaK0t4nYOfCA2Y4/D2tkqvIvLXiGsDErm7SK3XkjdI=; b=EPP/hWCfLaZErdBSHeFFIHXTICHY0Ab0PSNkkg36FW+AYi03wJnoMp4ZxkyMN4rNR1 K/Oh7aoFlC0W7TuA6TD/f7fcGc2Hw/EEci4dAtRfUpIEDyvYIG/Y+xMDquEcFV+atwn/ y+zeGebTxnnMq+m/AZGHJf1i31VJOvdJprr7D9ZoWQpK0LEesjkuvqBnoxExQSUvff2Y 3Cu9yDmPaykJPpuYVkRhLicGLd17TevkfTd+iYeYeyxUwMkBVKtA65myVHG7TnyBJcA4 dY8+nElYXeFNqaOttZbaxTiM6RtZT5y0tzPZGyv3int7xvs8di4kfJLs+D93fMzJTkEE r6iQ== X-Gm-Message-State: AOAM532gXFuurIV6cKhIxyA+yZTV6R2DBWjQLzC3wmr2E30ghIiwoYol qy8PdqG4w8+6U7ampv5VigScKQ== X-Google-Smtp-Source: ABdhPJxFovuPfosyUgI0jjp9lhIxEbfgu299pf7CRORC35vuTw+7XiOoMPiByruJt2GKSaATsmfYPg== X-Received: by 2002:a17:90a:e7cc:b0:1bf:5ab5:f481 with SMTP id kb12-20020a17090ae7cc00b001bf5ab5f481mr23539576pjb.215.1647636490249; Fri, 18 Mar 2022 13:48:10 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:8a24:4160:f3b6:42dd]) by smtp.gmail.com with ESMTPSA id h11-20020a056a00170b00b004f7a83058d5sm11151891pfc.16.2022.03.18.13.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 13:48:09 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron , Lars-Peter Clausen Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Gwendal Grignou Subject: [PATCH] iio:proximity:sx9324: Fix hardware gain read/write Date: Fri, 18 Mar 2022 13:48:08 -0700 Message-Id: <20220318204808.3404542-1-swboyd@chromium.org> X-Mailer: git-send-email 2.35.1.894.gb6a874cedc-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org There are four possible gain values according to sx9324_gain_vals[]: 1, 2, 4, and 8. When writing and reading the register the values are off by one. The bits should be set according to this equation: ilog2() + 1 so that a gain of 8 is 0x3 in the register field and a gain of 4 is 0x2 in the register field, etc. Fix up the functions. Fixes: 4c18a890dff8 ("iio:proximity:sx9324: Add SX9324 support") Cc: Gwendal Grignou Signed-off-by: Stephen Boyd --- drivers/iio/proximity/sx9324.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: a8ee3b32f5da6c77a5ccc0e42c2250d61ba54fe0 diff --git a/drivers/iio/proximity/sx9324.c b/drivers/iio/proximity/sx9324.c index 0d9bbbb50cb4..a3c8e02f5a56 100644 --- a/drivers/iio/proximity/sx9324.c +++ b/drivers/iio/proximity/sx9324.c @@ -379,7 +379,10 @@ static int sx9324_read_gain(struct sx_common_data *data, if (ret) return ret; - *val = 1 << FIELD_GET(SX9324_REG_PROX_CTRL0_GAIN_MASK, regval); + regval = FIELD_GET(SX9324_REG_PROX_CTRL0_GAIN_MASK, regval); + if (regval) + regval--; + *val = 1 << regval; return IIO_VAL_INT; } @@ -725,7 +728,7 @@ static int sx9324_write_gain(struct sx_common_data *data, unsigned int gain, reg; int ret; - gain = ilog2(val); + gain = ilog2(val) + 1; reg = SX9324_REG_PROX_CTRL0 + chan->channel / 2; gain = FIELD_PREP(SX9324_REG_PROX_CTRL0_GAIN_MASK, gain);