Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2028701rwe; Fri, 2 Sep 2022 07:33:35 -0700 (PDT) X-Google-Smtp-Source: AA6agR47ntq/IXsGK+19+6UUZax+l1EAFQN2p34K47IK0e07dY9DlOmkO6UaG/uj1/O9ee/8o0im X-Received: by 2002:a17:90b:4d8c:b0:1fe:389f:fbe5 with SMTP id oj12-20020a17090b4d8c00b001fe389ffbe5mr5310222pjb.197.1662129215086; Fri, 02 Sep 2022 07:33:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662129215; cv=none; d=google.com; s=arc-20160816; b=jYFSPNIC51uOES045+IWcuAulIX4yXI232nFEI12NTLVjFtNMCFHh8if8BX6m5OWGH uEIsllfEuVTrZX8ZDrZLq5Xt9FfspjMrFS6lJIsS9cVtOQa1NMrQUHmpjg8Y8VMZz44Z qYVJQn9IrIxC+1rZT1EAT5qfaIBXs+ZyMfFPa27IU5mYO96EVzpdMqd8I0VpDsEKqrag MsNDb5W4le1V89gm8y3FxBqxdxbm5JzNcBZVSkjEVAemq/jy2jLVmJTXF+g9adJb1Vv2 wWks34SQ6CbVRe2MVQAWCGrTUqaaRirRy/IeDVVo0ZRb7xeOG57L/xlqkgtSEt4gMEJv CMMg== 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; bh=UXLXT2ZkpkjRv/imjMjyuJ/cDuAi3dUahtJ/P71vQ/4=; b=as4UTxl8TGPfZDsMu4wgMJS+HEK+WWbTW69EyN6f875A2RxtzE4dc1sTAMQ+JstRBp n9tcAvEgAkt9hOVizGUNR0ozMo5vUlfnNgMCH3P/Elhh28OiWxmm1s98cYSl+qajPtQ+ Z+z4L2lVT1Yo2mFUJp5tI331mczBhFVG1B+gnPMg0Gfc/MsvhWT7kZ19uSsFNyr9RBDH N/a4hs68Jm+2C1khGxQrrj2a/HT/jM+xWz1pybRW6KXyu6l92ct18PM4J+2uahni0+G+ YFN+1SM0OQbI9SwVK3jO2b3LCQf0T92FAUf7IewfBdn/k6ybDuI5oyz0rjFj7ZSaIYtA lM+Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n15-20020a170902d2cf00b0017456ec0fbesi1457916plc.603.2022.09.02.07.33.18; Fri, 02 Sep 2022 07:33:35 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238902AbiIBOQI (ORCPT + 99 others); Fri, 2 Sep 2022 10:16:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238918AbiIBOPn (ORCPT ); Fri, 2 Sep 2022 10:15:43 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3BA914D464 for ; Fri, 2 Sep 2022 06:42:46 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oU6Ue-0007Va-Hm; Fri, 02 Sep 2022 15:13:56 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oU6Ub-003VMs-EQ; Fri, 02 Sep 2022 15:13:55 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oU6Uc-006elN-E7; Fri, 02 Sep 2022 15:13:54 +0200 From: Oleksij Rempel To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, Andy Shevchenko Subject: [PATCH v4 2/3] iio: adc: tsc2046: add vref support Date: Fri, 2 Sep 2022 15:13:51 +0200 Message-Id: <20220902131352.1586599-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220902131352.1586599-1-o.rempel@pengutronix.de> References: <20220902131352.1586599-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 If VREF pin is attached, we should use external VREF source instead of the internal. Otherwise we will get wrong measurements on some of channel types. Signed-off-by: Oleksij Rempel --- changes v4: - use vref_reg pointer instead of bool use_internal_vref - move regulator registration to a separate function - rework error handling - add devm_add_action_or_reset --- drivers/iio/adc/ti-tsc2046.c | 54 ++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c index 0d9436a69cbfb..5f92754e066be 100644 --- a/drivers/iio/adc/ti-tsc2046.c +++ b/drivers/iio/adc/ti-tsc2046.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -175,6 +176,8 @@ struct tsc2046_adc_priv { u32 time_per_bit_ns; struct tsc2046_adc_ch_cfg ch_cfg[TI_TSC2046_MAX_CHAN]; + unsigned int vref_mv; + struct regulator *vref_reg; }; #define TI_TSC2046_V_CHAN(index, bits, name) \ @@ -252,7 +255,9 @@ static u8 tsc2046_adc_get_cmd(struct tsc2046_adc_priv *priv, int ch_idx, case TI_TSC2046_ADDR_AUX: case TI_TSC2046_ADDR_VBAT: case TI_TSC2046_ADDR_TEMP0: - pd |= TI_TSC2046_SER | TI_TSC2046_PD1_VREF_ON; + pd |= TI_TSC2046_SER; + if (!priv->vref_reg) + pd |= TI_TSC2046_PD1_VREF_ON; } return TI_TSC2046_START | FIELD_PREP(TI_TSC2046_ADDR, ch_idx) | pd; @@ -468,7 +473,7 @@ static int tsc2046_adc_read_raw(struct iio_dev *indio_dev, * So, it is better to use external voltage-divider driver * instead, which is calculating complete chain. */ - *val = TI_TSC2046_INT_VREF; + *val = priv->vref_mv; *val2 = chan->scan_type.realbits; return IIO_VAL_FRACTIONAL_LOG2; } @@ -740,6 +745,47 @@ static void tsc2046_adc_parse_fwnode(struct tsc2046_adc_priv *priv) } } +static void tsc2046_adc_regulator_disable(void *data) +{ + struct tsc2046_adc_priv *priv = data; + + regulator_disable(priv->vref_reg); +} + +static int tsc2046_adc_configure_regulator(struct tsc2046_adc_priv *priv) +{ + struct device *dev = &priv->spi->dev; + int ret; + + priv->vref_reg = devm_regulator_get_optional(dev, "vref"); + if (IS_ERR(priv->vref_reg) && PTR_ERR(priv->vref_reg) != -ENODEV) + return PTR_ERR(priv->vref_reg); + + if (IS_ERR_OR_NULL(priv->vref_reg)) { + priv->vref_reg = NULL; + /* Use internal reference */ + priv->vref_mv = TI_TSC2046_INT_VREF; + return 0; + } + + ret = regulator_enable(priv->vref_reg); + if (ret) + return ret; + + ret = devm_add_action_or_reset(dev, tsc2046_adc_regulator_disable, + priv); + if (ret) + return ret; + + ret = regulator_get_voltage(priv->vref_reg); + if (ret < 0) + return ret; + + priv->vref_mv = ret / 1000; + + return 0; +} + static int tsc2046_adc_probe(struct spi_device *spi) { const struct tsc2046_adc_dcfg *dcfg; @@ -781,6 +827,10 @@ static int tsc2046_adc_probe(struct spi_device *spi) indio_dev->num_channels = dcfg->num_channels; indio_dev->info = &tsc2046_adc_info; + ret = tsc2046_adc_configure_regulator(priv); + if (ret) + return ret; + tsc2046_adc_parse_fwnode(priv); ret = tsc2046_adc_setup_spi_msg(priv); -- 2.30.2