Received: by 2002:a05:6358:bb9e:b0:b9:5105:a5b4 with SMTP id df30csp606964rwb; Fri, 2 Sep 2022 22:05:36 -0700 (PDT) X-Google-Smtp-Source: AA6agR6251CrgazVy6iaugWKqQYeJR7oULPhyi1fXu4afcw51bzvnKMOp0h4LsmoGmID7ZHXgFZp X-Received: by 2002:a05:6402:428a:b0:42e:8f7e:1638 with SMTP id g10-20020a056402428a00b0042e8f7e1638mr35887104edc.228.1662181535834; Fri, 02 Sep 2022 22:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662181535; cv=none; d=google.com; s=arc-20160816; b=LBfT9lfEzlRCrFVhhBkANHEhIjX8HGk09bkkoy46kuC/fye/5R7byG50Bta2Ky/Nwn ooMaN9wri+KAci8xOEP/jQBFSAsD6xJ4G0v2jsXifZFfrgCZ0EEjmBj77hhBiK+MZIfD 5N1tji5kx3WHofV6BxC6MYJ8pVwtNKKx/Pm35yxY0bQyyhATj06f8TrhxNFU6VMA0zUL F90Vzb7N61W2IB9dmYmMDwlCuWYrgnU8BiLhxNvOe4N+KCafTce955Ex52g+RoXZHZN8 E1BgDx9SB3U6Vz9z2u6db0TNhUGCOfW+vGS5cGLnuxQldNCe1LaZX+hazs+QDsldHWJw dM6w== 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=jAd9sEBmCKtsmNUs0tPXUqCjzQ+g02g/ut8vwakYGYE=; b=LX6PM2cMxx4J1KC4xuTLSOiABguZ1RPHf2s+kc6SftXBLtB8ahx0a0OrGM0C3cv5Gv TkRv9EROvdc4FQqjxE5lVT6CfGgQsvdG5tcvYBIwKQjN/4AECXv2oY7ihH0LcjooM9OV 539nkI42r8bO9TZJg3RKtqDTZY/Xah37mz0V4qMWacmrYX/aEYoFVvl0n99cfBH3/aJC 6gniSHFbu/HbnqNPNY++kFKacOnCII0yWOPfXPhRcFON6ZZO58D4pCLwJmDkr6PUekmW dTaRdlclq9Y4GPVlmXvnFJe78tDFEUWhN4YVqSvoRn+G3LsG5P0IjI7ZOS3uQVOXuE+N hoVA== 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 n22-20020aa7c696000000b004480a02d5f5si2944319edq.252.2022.09.02.22.05.10; Fri, 02 Sep 2022 22:05: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 S229952AbiICFDH (ORCPT + 99 others); Sat, 3 Sep 2022 01:03:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbiICFDG (ORCPT ); Sat, 3 Sep 2022 01:03:06 -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 A057EE8687 for ; Fri, 2 Sep 2022 22:03:04 -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 1oULJ1-0000pw-52; Sat, 03 Sep 2022 07:02:55 +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 1oULIy-003cUy-4d; Sat, 03 Sep 2022 07:02:54 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oULIz-00BNWD-A2; Sat, 03 Sep 2022 07:02:53 +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 v5 2/3] iio: adc: tsc2046: add vref support Date: Sat, 3 Sep 2022 07:02:51 +0200 Message-Id: <20220903050252.2711950-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220903050252.2711950-1-o.rempel@pengutronix.de> References: <20220903050252.2711950-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=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 If VREF pin is attached, we should use external VREF source instead of the internal. Otherwise we will get wrong measurements on some of the channel types. Signed-off-by: Oleksij Rempel --- changes v5: - add "the" before channel - refactor error handling on regulator registration - use MILLI instead of 1000 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 | 57 ++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c index 0d9436a69cbfb..c7601b29b3bef 100644 --- a/drivers/iio/adc/ti-tsc2046.c +++ b/drivers/iio/adc/ti-tsc2046.c @@ -8,7 +8,9 @@ #include #include #include +#include #include +#include #include @@ -175,6 +177,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 +256,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 +474,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 +746,49 @@ 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)) { + /* If regulator exists but can't be get, return an error */ + if (PTR_ERR(priv->vref_reg) != -ENODEV) + return PTR_ERR(priv->vref_reg); + priv->vref_reg = NULL; + } + if (!priv->vref_reg) { + /* 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 / MILLI; + + return 0; +} + static int tsc2046_adc_probe(struct spi_device *spi) { const struct tsc2046_adc_dcfg *dcfg; @@ -781,6 +830,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