Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp355066imw; Mon, 4 Jul 2022 10:26:40 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vqr3aLUllfK4mOSUrVlkYarprPpcjWvuo8fWdYCIShSrHzayjsIytmGx2Pk7MaltGmchGx X-Received: by 2002:a17:90b:164a:b0:1ec:b990:17bf with SMTP id il10-20020a17090b164a00b001ecb99017bfmr37539741pjb.171.1656955600604; Mon, 04 Jul 2022 10:26:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656955600; cv=none; d=google.com; s=arc-20160816; b=rU+r7AObB/CAUSXewEk+7wlmj5eVLi2JfyQi34jqlqGP2H5syiPBs4vsU1PowWwGnq 2Vh4JfP9ypWrgbFlmXgEeqh68GG7iLu6T2M6WxiEZz+egb2cT+5CoUiMa3B3kpn+fGnP 6bGNwsaHHs1kRwKTaVukGEa/uMRyHLchD56NXSWYGELLR9ig6zFkFaEtgiic21leYF6s JVSO6YuDV+h/Lm2EizJ5yzWytd2xmsbmPoPMqVhxhC4kFu4VxKxD5yZg/yja94ges7Zo yqBB+PUmMIqDcLsdLiEMu8xH1GCci9UQ0JHIH1rF3lyHHkqW1i8Hz19R3AxjCHm04vLv 9Jsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=c0RRFr1/0VSC8RisYdALgOp+0KHQIKOc91K1b7cS78g=; b=rfTe3zOwZVODzHy0N8s+Cm5ZXmLFrWQrMo+NLiLXCrH3Wzcy39G/66VQSm7DdvHVkL neyKf7LmjT8ofA37tyvCoB3nVcvoX5bakPJVbiar8X2Qe3CdWiJ61DS1mULxA0190gBp SHoHli3aSYhwc2Pc4/xf6I9bEEGFhWTSgTlx2ZUjHrFR4ZkBqvp0t+vjVhEtSNmFzKxf 7b+Rk88Ff562npOyE7QvwhXEjAYb+11Q355At+Qdlzq5yUbk+U+Co+Zs/ep2s4p55noa snIG6x/hRiw1EwPG6U+vEATuXJQpzG4pz6kiCUtvkds5gmLDlPLkfh2avKtancPq+2iW jvIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N16SsQyU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i71-20020a63874a000000b00411708ad9c3si24239097pge.869.2022.07.04.10.26.07; Mon, 04 Jul 2022 10:26:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=N16SsQyU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234707AbiGDRTo (ORCPT + 99 others); Mon, 4 Jul 2022 13:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234512AbiGDRTf (ORCPT ); Mon, 4 Jul 2022 13:19:35 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CEE45F4E; Mon, 4 Jul 2022 10:19:20 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id bx13so11806066ljb.1; Mon, 04 Jul 2022 10:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c0RRFr1/0VSC8RisYdALgOp+0KHQIKOc91K1b7cS78g=; b=N16SsQyUfckM3WZLSBGwPGuxRWBhO6mS2DVXLofseYBcqHLhmroRKdvSMPxWasNmo6 SlSLtP5AOBcTb7JwDcHy0cPJq9NRVWkLwPdsVbmQdT7jaZDLs/ZuRcgGXJXom0XwihO/ qnIFCSRImrMh6HEdwicUPCz9Y2QKy+aM51SavU5aRUDWRqdMwI4uWT9N/JNREW5VtfMW yBAHrno703z/6f54xdvmtQhu4bauaSeUpVA6CHXKjcEmApKAvx4dNQxUzx6DhP++Duro kTmSD+RGtOumUkVYwP7rEz/+uzI8q5VUH35S92DJxT2QkmT0ULCXfpYqKm6hb+Z7CfHu Wgfg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=c0RRFr1/0VSC8RisYdALgOp+0KHQIKOc91K1b7cS78g=; b=VOk3hMwHPWTjAKLxzkDtp6Ff0bRcDeUxkEfT2fBdzcjm6JYKwaufRjX3VIfnsmJG4V 6Jat5urFEbA+u2CiAbsBbEUbbauFzD14ugAfb7Mym1vlhRjxvjOg2fMS3B1LETURnhYo k3/CoZz8f5bG9z1kpU86U28BAUMuzOdgzdZu2FsXkk4RtOZjff7IQWs026f0lMgICTn9 6kuK0cfplN5p3lBrhSLMWQhc3+eDi4Ye4LIq6RAzJYeCQqMCgZ2iT2XURv+Ah9paGQcl bRJKMLZwAcLo2o1gAtOULAdgk1LFx8w8wuiAU1Jr6aULvf3hu2TkAhIAzX653CYwbYvC VBcw== X-Gm-Message-State: AJIora+VojNrqtOemS2bKq0SDzkWD/biJ0n++YroKy2dIeH/QCbK/p+I o+O+vSMrDWOp9j2FBTKVK7s= X-Received: by 2002:a05:651c:1699:b0:25b:c598:3803 with SMTP id bd25-20020a05651c169900b0025bc5983803mr17569254ljb.0.1656955158926; Mon, 04 Jul 2022 10:19:18 -0700 (PDT) Received: from localhost.localdomain (82-209-154-112.cust.bredband2.com. [82.209.154.112]) by smtp.gmail.com with ESMTPSA id v9-20020a2ea609000000b0025bf6099cdbsm2772720ljp.78.2022.07.04.10.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Jul 2022 10:19:18 -0700 (PDT) From: Marcus Folkesson To: Marcus Folkesson , Kent Gustavsson , Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 9/9] iio: adc: mcp3911: add support to set PGA Date: Mon, 4 Jul 2022 19:21:16 +0200 Message-Id: <20220704172116.195841-10-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220704172116.195841-1-marcus.folkesson@gmail.com> References: <20220704172116.195841-1-marcus.folkesson@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for setting the Programmable Gain Amplifiers by adjust the scale value. Signed-off-by: Marcus Folkesson --- drivers/iio/adc/mcp3911.c | 107 +++++++++++++++++++++++++++++--------- 1 file changed, 83 insertions(+), 24 deletions(-) diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index c6e30471bb81..7fc53f0057d6 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c @@ -26,6 +26,8 @@ #define MCP3911_REG_MOD 0x06 #define MCP3911_REG_PHASE 0x07 #define MCP3911_REG_GAIN 0x09 +#define MCP3911_GAIN_MASK(ch) (0x7 << 3 * ch) +#define MCP3911_GAIN_VAL(ch, val) ((val << 3 * ch) & MCP3911_GAIN_MASK(ch)) #define MCP3911_REG_STATUSCOM 0x0a #define MCP3911_STATUSCOM_DRHIZ BIT(12) @@ -56,8 +58,10 @@ #define MCP3911_REG_WRITE(reg, id) ((((reg) << 1) | ((id) << 5) | (0 << 0)) & 0xff) #define MCP3911_NUM_CHANNELS 2 +#define MCP3911_NUM_SCALES 6 static const int mcp3911_osr_table[] = { 32, 64, 128, 256, 512, 1024, 2048, 4096 }; +static u32 mcp3911_scale_table[MCP3911_NUM_SCALES][2]; struct mcp3911 { struct spi_device *spi; @@ -66,6 +70,7 @@ struct mcp3911 { struct clk *clki; u32 dev_addr; struct iio_trigger *trig; + u32 gain[MCP3911_NUM_CHANNELS]; struct { u32 channels[MCP3911_NUM_CHANNELS]; s64 ts __aligned(8); @@ -142,6 +147,11 @@ static int mcp3911_read_avail(struct iio_dev *indio_dev, *vals = mcp3911_osr_table; *length = ARRAY_SIZE(mcp3911_osr_table); return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_SCALE: + *type = IIO_VAL_INT_PLUS_NANO; + *vals = (int *)mcp3911_scale_table; + *length = ARRAY_SIZE(mcp3911_scale_table) * 2; + return IIO_AVAIL_LIST; default: return -EINVAL; } @@ -187,29 +197,9 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, break; case IIO_CHAN_INFO_SCALE: - if (adc->vref) { - ret = regulator_get_voltage(adc->vref); - if (ret < 0) { - dev_err(indio_dev->dev.parent, - "failed to get vref voltage: %d\n", - ret); - goto out; - } - - *val = ret / 1000; - } else { - *val = MCP3911_INT_VREF_MV; - } - - /* - * 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; + *val = mcp3911_scale_table[ilog2(adc->gain[channel->channel])][0]; + *val2 = mcp3911_scale_table[ilog2(adc->gain[channel->channel])][1]; + ret = IIO_VAL_INT_PLUS_NANO; break; } @@ -227,6 +217,18 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, mutex_lock(&adc->lock); switch (mask) { + case IIO_CHAN_INFO_SCALE: + for (int i = 0; i < MCP3911_NUM_SCALES; i++) { + if (val == mcp3911_scale_table[i][0] && + val2 == mcp3911_scale_table[i][1]) { + + adc->gain[channel->channel] = BIT(i); + ret = mcp3911_update(adc, MCP3911_REG_GAIN, + MCP3911_GAIN_MASK(channel->channel), + MCP3911_GAIN_VAL(channel->channel, i), 1); + } + } + break; case IIO_CHAN_INFO_OFFSET: if (val2 != 0) { ret = -EINVAL; @@ -262,6 +264,47 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, return ret; } +static int mcp3911_calc_scale_table(struct mcp3911 *adc) +{ + u32 ref = MCP3911_INT_VREF_MV; + u32 div; + int ret; + int tmp0, tmp1; + s64 tmp2; + + if (adc->vref) { + ret = regulator_get_voltage(adc->vref); + if (ret < 0) { + dev_err(&adc->spi->dev, + "failed to get vref voltage: %d\n", + ret); + return ret; + } + + ref = ret / 1000; + } + + /* + * For 24bit Conversion + * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5 + * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5) + * + * ref = Reference voltage + * div = (2^23 * 1.5 * gain) = 12582912 * gain + */ + for (int i = 0; i < MCP3911_NUM_SCALES; i++) { + div = 12582912 * BIT(i); + tmp2 = div_s64((s64)ref * 1000000000LL, div); + tmp1 = div; + tmp0 = (int)div_s64_rem(tmp2, 1000000000, &tmp1); + + mcp3911_scale_table[i][0] = 0; + mcp3911_scale_table[i][1] = tmp1; + } + + return 0; +} + #define MCP3911_CHAN(idx) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ @@ -271,8 +314,10 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_OFFSET) | \ BIT(IIO_CHAN_INFO_SCALE), \ - .info_mask_shared_by_type_available = \ + .info_mask_shared_by_type_available = \ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ + .info_mask_separate_available = \ + BIT(IIO_CHAN_INFO_SCALE), \ .scan_type = { \ .sign = 's', \ .realbits = 24, \ @@ -490,6 +535,20 @@ static int mcp3911_probe(struct spi_device *spi) if (ret) return ret; + ret = mcp3911_calc_scale_table(adc); + if (ret) + return ret; + + /* Set gain to a known value (1) */ + for (int i = 0; i < MCP3911_NUM_CHANNELS; i++) { + adc->gain[i] = 1; + ret = mcp3911_update(adc, MCP3911_REG_GAIN, + MCP3911_GAIN_MASK(i), + MCP3911_GAIN_VAL(i, 0), 1); + if (ret) + return ret; + } + indio_dev->name = spi_get_device_id(spi)->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->info = &mcp3911_info; -- 2.36.1