From patchwork Sun Sep 24 21:51:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 144146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp852979vqu; Sun, 24 Sep 2023 14:54:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjKwS9NP4BnfyAQMwONCUbcOVuRjWga/biLfbbBeRaRLruhTikddRxc6zWWkYu6Tm2cLFY X-Received: by 2002:a05:6a20:9493:b0:153:b245:50ff with SMTP id hs19-20020a056a20949300b00153b24550ffmr5092280pzb.40.1695592471678; Sun, 24 Sep 2023 14:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695592471; cv=none; d=google.com; s=arc-20160816; b=DkYnqE4Og2Vq86erWdlCnB7s6hQREN0YgEp51LqAfcY0XpK+PyXWfq996SCtEQuj7v aL0gEMgN/uU/mBrXIlrQ0EZjWCmZMgYGBPJVi8H1RDM8AUn5yRG6UyXFG1ZBQddqvhvt PM+DkLfoT8Tv1DP1Xfmg/IhnCG6BKLhvLu/lgFqK3+09ZaKBb3UZ8F3ydXjEJ1y6jKnq 4eMEzlOeN4YX/CPMAgqvfD/AOQ4sCG03w67bd0FVlgB+wkYYF5e2rea80njCN16Qr9zz B/dK8DtwCVOl/KMzCh7o20EtbpxEKSBOWsokeUW9Mnh5Wq5qlHowYvwD5yflCUCwx5fC T+Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=0uMILxFEAcsaYLKyqAn5+Be+mSQ6Ty4Dmp+SlLyk7Jg=; fh=1KgYFizM+vRXr+0lGj0+OdO2+2S32xt6A3DZ1Qd4gVY=; b=UGOpw3cUc6DTxUzV4quCHufCEYQei2xzlwrLzUdw2uzG25KVAxLGAxqVh8ilo5cTwu TG9eh8x2HDePDthKm+L0J+p/BgG92IaybeHFB7K2foKQhe8qhUERfU0083X3gRPVm/5S Von05qTsBJpUWnv+W3MhbT+hDNCNSpF8XcgdiV77jX00chzzVdVRxuhvd9jSpYccP7Cz OQRa5ZzyH8iepo832g+P9cBULygW71WM+C4X5eYUdbaS5eN4A2ROX+8ruqnvQu/jxilY iKt++YvDxePGrLsNGrR+5fWhdjv/6EdPvx1bBO2WadbhRgndC6IvbPHarjkKkgdBNR5e HmFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=Z8XPN7BK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id s140-20020a632c92000000b00578a56a39dbsi8667431pgs.409.2023.09.24.14.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:54:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=Z8XPN7BK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id D7CC980930F8; Sun, 24 Sep 2023 14:52:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230230AbjIXVwf (ORCPT + 29 others); Sun, 24 Sep 2023 17:52:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229521AbjIXVwd (ORCPT ); Sun, 24 Sep 2023 17:52:33 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4965AFF; Sun, 24 Sep 2023 14:52:26 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3232be274a0so85499f8f.1; Sun, 24 Sep 2023 14:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695592345; x=1696197145; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0uMILxFEAcsaYLKyqAn5+Be+mSQ6Ty4Dmp+SlLyk7Jg=; b=Z8XPN7BKD7EW+BJPfGNJZFWMDroB3PpfnuA41VJtapHcYwo/VcOW0JkDLaPA7qxkt4 WK4vETwUtvjflboC2SCIMXc4t/MyMAw8X8SlkZ1NASaPwXSlXS2CVMesoDdvfRSzWf0N BJCDbGD8ggmXsb93SpW6G1vLP9iLjrz6GUB8uxyf1P2HPgnZeDF/ymrJd0hkWeXAhFSX zgUnn2XUpyyH9IAC40BcaviLPD6A7nm5XOFZimVkofmakFcVoLmhijpDZDUi1gN8wQjS NOB8dbWYZW4UZSRx2mA+13yRw0nX3yL2wsMAO8DHTySOZwv74LFfCqrbqFg0+TyPNM4Z Xm0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695592345; x=1696197145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0uMILxFEAcsaYLKyqAn5+Be+mSQ6Ty4Dmp+SlLyk7Jg=; b=wiEPZjKA2951rpLFLTTZeI/lwaZ/wzVISJKpYRZAFPFzyhEJItGKlZjAVOMwKngdSI mRk3VPlWKhVIF2UX87MQkf8//fB0INcIcc4l4PhCgvppsDXy7beD/0CW+S3hbwMSQGVa OYx1r0LBXmq1QLOsx7Gz4ifd3/RqeOls4/XJEVDJEPPE/AhXCMf2h75YN8pzNT9PtYrS J0cBEvXF/Wy+EZWkMpTX59yPa/FFDHd2C+MmcwIF1bJ936JROcoOSBesphh0DHyN3GjI +5YkxZEz6krUaApLgAhGzu4Dz8PKCgDBzf7AMYmXxQZNMWWjuKrwAIgBgYPX0HUNXDTp nc+g== X-Gm-Message-State: AOJu0Yw25Jdo476+2tn/lvgrHKX8Fif9Mj+R9vTreGXYrgFYVKx6B267 79yyUMGQqJ0cYSrkm5lUr0M= X-Received: by 2002:adf:ef83:0:b0:31f:ebfa:54eb with SMTP id d3-20020adfef83000000b0031febfa54ebmr6553331wro.3.1695592344664; Sun, 24 Sep 2023 14:52:24 -0700 (PDT) Received: from spiri.. ([2a02:2f08:a301:7000:1bc9:cab8:e784:6ddb]) by smtp.gmail.com with ESMTPSA id c10-20020a5d4f0a000000b0031f3ad17b2csm10144444wru.52.2023.09.24.14.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:52:24 -0700 (PDT) From: alisadariana@gmail.com Cc: Alisa-Dariana Roman , Jonathan Cameron , Lars-Peter Clausen , Alexandru Tachici , Michael Hennerich , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] iio: adc: ad7192: Use bitfield access macros Date: Mon, 25 Sep 2023 00:51:46 +0300 Message-Id: <20230924215148.102491-2-alisadariana@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230924215148.102491-1-alisadariana@gmail.com> References: <20230924215148.102491-1-alisadariana@gmail.com> MIME-Version: 1.0 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 14:52:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777957571578113986 X-GMAIL-MSGID: 1777957571578113986 From: Alisa-Dariana Roman Include bitfield.h and update driver to use bitfield access macros GENMASK, FIELD_PREP and FIELD_GET. Remove old macros in favor of using FIELD_PREP and masks. Change %d to %ld to match the type of FIELD_GET(). Signed-off-by: Alisa-Dariana Roman --- drivers/iio/adc/ad7192.c | 73 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index 69d1103b9508..d693f2ce8a20 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -43,7 +44,7 @@ #define AD7192_COMM_WEN BIT(7) /* Write Enable */ #define AD7192_COMM_WRITE 0 /* Write Operation */ #define AD7192_COMM_READ BIT(6) /* Read Operation */ -#define AD7192_COMM_ADDR(x) (((x) & 0x7) << 3) /* Register Address */ +#define AD7192_COMM_ADDR_MASK GENMASK(5, 3) /* Register Address Mask */ #define AD7192_COMM_CREAD BIT(2) /* Continuous Read of Data Register */ /* Status Register Bit Designations (AD7192_REG_STAT) */ @@ -56,17 +57,16 @@ #define AD7192_STAT_CH1 BIT(0) /* Channel 1 */ /* Mode Register Bit Designations (AD7192_REG_MODE) */ -#define AD7192_MODE_SEL(x) (((x) & 0x7) << 21) /* Operation Mode Select */ -#define AD7192_MODE_SEL_MASK (0x7 << 21) /* Operation Mode Select Mask */ -#define AD7192_MODE_STA(x) (((x) & 0x1) << 20) /* Status Register transmission */ +#define AD7192_MODE_SEL_MASK GENMASK(23, 21) /* Operation Mode Select Mask */ #define AD7192_MODE_STA_MASK BIT(20) /* Status Register transmission Mask */ -#define AD7192_MODE_CLKSRC(x) (((x) & 0x3) << 18) /* Clock Source Select */ +#define AD7192_MODE_CLKSRC_MASK GENMASK(19, 18) /* Clock Source Select Mask */ #define AD7192_MODE_SINC3 BIT(15) /* SINC3 Filter Select */ #define AD7192_MODE_ENPAR BIT(13) /* Parity Enable */ #define AD7192_MODE_CLKDIV BIT(12) /* Clock divide by 2 (AD7190/2 only)*/ #define AD7192_MODE_SCYCLE BIT(11) /* Single cycle conversion */ #define AD7192_MODE_REJ60 BIT(10) /* 50/60Hz notch filter */ -#define AD7192_MODE_RATE(x) ((x) & 0x3FF) /* Filter Update Rate Select */ + /* Filter Update Rate Select Mask */ +#define AD7192_MODE_RATE_MASK GENMASK(9, 0) /* Mode Register: AD7192_MODE_SEL options */ #define AD7192_MODE_CONT 0 /* Continuous Conversion Mode */ @@ -92,13 +92,12 @@ #define AD7192_CONF_CHOP BIT(23) /* CHOP enable */ #define AD7192_CONF_ACX BIT(22) /* AC excitation enable(AD7195 only) */ #define AD7192_CONF_REFSEL BIT(20) /* REFIN1/REFIN2 Reference Select */ -#define AD7192_CONF_CHAN(x) ((x) << 8) /* Channel select */ -#define AD7192_CONF_CHAN_MASK (0x7FF << 8) /* Channel select mask */ +#define AD7192_CONF_CHAN_MASK GENMASK(18, 8) /* Channel select mask */ #define AD7192_CONF_BURN BIT(7) /* Burnout current enable */ #define AD7192_CONF_REFDET BIT(6) /* Reference detect enable */ #define AD7192_CONF_BUF BIT(4) /* Buffered Mode Enable */ #define AD7192_CONF_UNIPOLAR BIT(3) /* Unipolar/Bipolar Enable */ -#define AD7192_CONF_GAIN(x) ((x) & 0x7) /* Gain Select */ +#define AD7192_CONF_GAIN_MASK GENMASK(2, 0) /* Gain Select */ #define AD7192_CH_AIN1P_AIN2M BIT(0) /* AIN1(+) - AIN2(-) */ #define AD7192_CH_AIN3P_AIN4M BIT(1) /* AIN3(+) - AIN4(-) */ @@ -130,7 +129,7 @@ #define CHIPID_AD7192 0x0 #define CHIPID_AD7193 0x2 #define CHIPID_AD7195 0x6 -#define AD7192_ID_MASK 0x0F +#define AD7192_ID_MASK GENMASK(3, 0) /* GPOCON Register Bit Designations (AD7192_REG_GPOCON) */ #define AD7192_GPOCON_BPDSW BIT(6) /* Bridge power-down switch enable */ @@ -272,7 +271,7 @@ static int ad7192_set_channel(struct ad_sigma_delta *sd, unsigned int channel) struct ad7192_state *st = ad_sigma_delta_to_ad7192(sd); st->conf &= ~AD7192_CONF_CHAN_MASK; - st->conf |= AD7192_CONF_CHAN(channel); + st->conf |= FIELD_PREP(AD7192_CONF_CHAN_MASK, channel); return ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, st->conf); } @@ -283,7 +282,7 @@ static int ad7192_set_mode(struct ad_sigma_delta *sd, struct ad7192_state *st = ad_sigma_delta_to_ad7192(sd); st->mode &= ~AD7192_MODE_SEL_MASK; - st->mode |= AD7192_MODE_SEL(mode); + st->mode |= FIELD_PREP(AD7192_MODE_SEL_MASK, mode); return ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode); } @@ -295,7 +294,7 @@ static int ad7192_append_status(struct ad_sigma_delta *sd, bool append) int ret; mode &= ~AD7192_MODE_STA_MASK; - mode |= AD7192_MODE_STA(append); + mode |= FIELD_PREP(AD7192_MODE_STA_MASK, append); ret = ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, mode); if (ret < 0) @@ -399,17 +398,17 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np) if (ret) return ret; - id &= AD7192_ID_MASK; + id = FIELD_GET(AD7192_ID_MASK, id); if (id != st->chip_info->chip_id) dev_warn(&st->sd.spi->dev, "device ID query failed (0x%X != 0x%X)\n", id, st->chip_info->chip_id); - st->mode = AD7192_MODE_SEL(AD7192_MODE_IDLE) | - AD7192_MODE_CLKSRC(st->clock_sel) | - AD7192_MODE_RATE(480); + st->mode = FIELD_PREP(AD7192_MODE_SEL_MASK, AD7192_MODE_IDLE) | + FIELD_PREP(AD7192_MODE_CLKSRC_MASK, st->clock_sel) | + FIELD_PREP(AD7192_MODE_RATE_MASK, 480); - st->conf = AD7192_CONF_GAIN(0); + st->conf = FIELD_PREP(AD7192_CONF_GAIN_MASK, 0); rej60_en = of_property_read_bool(np, "adi,rejection-60-Hz-enable"); if (rej60_en) @@ -455,7 +454,7 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np) for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++) { scale_uv = ((u64)st->int_vref_mv * 100000000) >> (indio_dev->channels[0].scan_type.realbits - - ((st->conf & AD7192_CONF_UNIPOLAR) ? 0 : 1)); + !FIELD_GET(AD7192_CONF_UNIPOLAR, st->conf)); scale_uv >>= i; st->scale_avail[i][1] = do_div(scale_uv, 100000000) * 10; @@ -472,7 +471,7 @@ static ssize_t ad7192_show_ac_excitation(struct device *dev, struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ad7192_state *st = iio_priv(indio_dev); - return sysfs_emit(buf, "%d\n", !!(st->conf & AD7192_CONF_ACX)); + return sysfs_emit(buf, "%ld\n", FIELD_GET(AD7192_CONF_ACX, st->conf)); } static ssize_t ad7192_show_bridge_switch(struct device *dev, @@ -482,7 +481,8 @@ static ssize_t ad7192_show_bridge_switch(struct device *dev, struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ad7192_state *st = iio_priv(indio_dev); - return sysfs_emit(buf, "%d\n", !!(st->gpocon & AD7192_GPOCON_BPDSW)); + return sysfs_emit(buf, "%ld\n", + FIELD_GET(AD7192_GPOCON_BPDSW, st->gpocon)); } static ssize_t ad7192_set(struct device *dev, @@ -537,14 +537,14 @@ static void ad7192_get_available_filter_freq(struct ad7192_state *st, /* Formulas for filter at page 25 of the datasheet */ fadc = DIV_ROUND_CLOSEST(st->fclk, - AD7192_SYNC4_FILTER * AD7192_MODE_RATE(st->mode)); + AD7192_SYNC4_FILTER * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); freq[0] = DIV_ROUND_CLOSEST(fadc * 240, 1024); fadc = DIV_ROUND_CLOSEST(st->fclk, - AD7192_SYNC3_FILTER * AD7192_MODE_RATE(st->mode)); + AD7192_SYNC3_FILTER * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); freq[1] = DIV_ROUND_CLOSEST(fadc * 240, 1024); - fadc = DIV_ROUND_CLOSEST(st->fclk, AD7192_MODE_RATE(st->mode)); + fadc = DIV_ROUND_CLOSEST(st->fclk, FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); freq[2] = DIV_ROUND_CLOSEST(fadc * 230, 1024); freq[3] = DIV_ROUND_CLOSEST(fadc * 272, 1024); } @@ -665,11 +665,11 @@ static int ad7192_get_3db_filter_freq(struct ad7192_state *st) unsigned int fadc; fadc = DIV_ROUND_CLOSEST(st->fclk, - st->f_order * AD7192_MODE_RATE(st->mode)); + st->f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); - if (st->conf & AD7192_CONF_CHOP) + if (FIELD_GET(AD7192_CONF_CHOP, st->conf)) return DIV_ROUND_CLOSEST(fadc * 240, 1024); - if (st->mode & AD7192_MODE_SINC3) + if (FIELD_GET(AD7192_MODE_SINC3, st->mode)) return DIV_ROUND_CLOSEST(fadc * 272, 1024); else return DIV_ROUND_CLOSEST(fadc * 230, 1024); @@ -682,7 +682,8 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, long m) { struct ad7192_state *st = iio_priv(indio_dev); - bool unipolar = !!(st->conf & AD7192_CONF_UNIPOLAR); + bool unipolar = !!FIELD_GET(AD7192_CONF_UNIPOLAR, st->conf); + u8 gain = FIELD_GET(AD7192_CONF_GAIN_MASK, st->conf); switch (m) { case IIO_CHAN_INFO_RAW: @@ -691,8 +692,8 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, switch (chan->type) { case IIO_VOLTAGE: mutex_lock(&st->lock); - *val = st->scale_avail[AD7192_CONF_GAIN(st->conf)][0]; - *val2 = st->scale_avail[AD7192_CONF_GAIN(st->conf)][1]; + *val = st->scale_avail[gain][0]; + *val2 = st->scale_avail[gain][1]; mutex_unlock(&st->lock); return IIO_VAL_INT_PLUS_NANO; case IIO_TEMP: @@ -713,7 +714,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case IIO_CHAN_INFO_SAMP_FREQ: *val = st->fclk / - (st->f_order * 1024 * AD7192_MODE_RATE(st->mode)); + (st->f_order * 1024 * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); return IIO_VAL_INT; case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: *val = ad7192_get_3db_filter_freq(st); @@ -746,8 +747,8 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, if (val2 == st->scale_avail[i][1]) { ret = 0; tmp = st->conf; - st->conf &= ~AD7192_CONF_GAIN(-1); - st->conf |= AD7192_CONF_GAIN(i); + st->conf &= ~AD7192_CONF_GAIN_MASK; + st->conf |= FIELD_PREP(AD7192_CONF_GAIN_MASK, i); if (tmp == st->conf) break; ad_sd_write_reg(&st->sd, AD7192_REG_CONF, @@ -769,8 +770,8 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, break; } - st->mode &= ~AD7192_MODE_RATE(-1); - st->mode |= AD7192_MODE_RATE(div); + st->mode &= ~AD7192_MODE_RATE_MASK; + st->mode |= FIELD_PREP(AD7192_MODE_RATE_MASK, div); ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode); break; case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: @@ -830,7 +831,7 @@ static int ad7192_update_scan_mode(struct iio_dev *indio_dev, const unsigned lon conf &= ~AD7192_CONF_CHAN_MASK; for_each_set_bit(i, scan_mask, 8) - conf |= AD7192_CONF_CHAN(i); + conf |= FIELD_PREP(AD7192_CONF_CHAN_MASK, i); ret = ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, conf); if (ret < 0) From patchwork Sun Sep 24 21:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 144147 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp852993vqu; Sun, 24 Sep 2023 14:54:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuY40fKBH5tvC5+81N+hWQReQvWr0iF6Iu60OFmI4piC9eCgjPzlX/HhbvRoLkkxBGmu/B X-Received: by 2002:a17:902:d702:b0:1c3:90c7:b99d with SMTP id w2-20020a170902d70200b001c390c7b99dmr4132528ply.41.1695592473934; Sun, 24 Sep 2023 14:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695592473; cv=none; d=google.com; s=arc-20160816; b=QwJa60V1jMefNhdlV3U166EmWtQVu02foi58hVYXQLgHMGpzmPdHJCn9MeHDeh1xLy ChEG5KXf+11rfZgFhFN02Xdp94Bargov4iBJxgzAnFIwa2JpWp530Hwz2RiCXB2bZiP5 rse2qIlX4fe0MA22wvY0Agd3IhXS8eE2zirFqnZ93IlMoTdfJLo5BrMblKuWi1+8RtFm 8FIi9dAqKRE9FrO2pl49Dse9fNVe27X7shX7YSfHCD9KN5TPAOV57AADpViQc9osSfg8 mReIHTLMw+o2/wTvrwY7nvf3Y4QRO7lJWWKyVEsbh2DAdvenNpPVZRIijqkAOiaDSJla THeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=x1mUiu1NbtoOEm28VDfVFWd43xm6wsUmZ3K7SF3CDig=; fh=1KgYFizM+vRXr+0lGj0+OdO2+2S32xt6A3DZ1Qd4gVY=; b=Jx8LcskA2TUK734/9HuNu7lD86WMWMrNrv+wEqqJeuqtHGtr6WoxC+5totdCLso1bu f5J0BFs8TyguzObWjamv6GLmWuwMi9ItNeIUTOSVRWjJJMJFHN6z7I2/a24cTMfOQcFW biRbYEmcZVHLC3lg6ugATmEBoKwJBT+hbITgIaqjrqaLkMbGIE7FMi3iMBv7cHTGia/7 48H2soNu/X4mMpiDiRLmaW5kdXfN9YbeiufrKdgccfEGseiq3X9kZMK66JcMWXSEGNXf kQ1MVsAAYTXlW4rL2oS2diGvXlBBNsREEOZvcuB4szFd2d9iHF+KLJFPZHJL15B7bGaY 766g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=bCPr3Sjc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id s19-20020a170903201300b001c467c2d2desi8169978pla.240.2023.09.24.14.54.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:54:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=bCPr3Sjc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 4A6BD809C66F; Sun, 24 Sep 2023 14:52:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230148AbjIXVwl (ORCPT + 29 others); Sun, 24 Sep 2023 17:52:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbjIXVwj (ORCPT ); Sun, 24 Sep 2023 17:52:39 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF19010D; Sun, 24 Sep 2023 14:52:28 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32003aae100so4368939f8f.0; Sun, 24 Sep 2023 14:52:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695592347; x=1696197147; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x1mUiu1NbtoOEm28VDfVFWd43xm6wsUmZ3K7SF3CDig=; b=bCPr3Sjc3F09pWHMz9N3XG1qzpkji8AwgJAnviL0JomwH0YxczLw+jo7bTfbN9IId6 a+vy3DmRvrUBirr7/LjyMwUIVHa6DZWK0BeVd56IsfndfQEOAg7nHIOh9Nk4Sr+uCuJg 0gOhMb3t58yvmRpV879YwvbxgoM3sWNHaBUxo4y11/2LwYIIg8Qcpdd71xpwLWmyoW9Y ut/JgekQDhBm9du0q0Fm0EoMNWRb1B3kD4AgL8fz498aARpgjPLOzKymlWaOqFHlSjbq KTIbEvjXZtXXYoa+lzK2LJ/Fmor82aPo8hXOrlK2o7wALABl6hd8dy00hl0PhfMEY96Q cAKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695592347; x=1696197147; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x1mUiu1NbtoOEm28VDfVFWd43xm6wsUmZ3K7SF3CDig=; b=vWkTAGGMu8sS/U3NavdIEe5TPNj7Yi3fsz3po/dacwldq6dl4kaNgG5CSl9AIEtjQI XryFFpJTZVIxZv3sPK0IvqwI043BCkaiYWxzuCe8R4mMa13CVjtHRrXIlN8VrKPW4l71 y4+2PSV/lhnYCJB92pZMqswGi0nWZ4IoawTdiOs3FuGmW1Fz2mjaJPNtq0h3clpky1GN VZxZ713LX/0ujjsQg8RDLqjkjum0qHnwvYKv9KJgTX1jZ6gFD+8gWwTwX1mR9JGzhWUY 2qiz+owmM17G/LYdeaWJNMpG31u2MtGSYmRhDi3U3yRI8coq0zpOeapX3iUmAjNsdk5S /Tqw== X-Gm-Message-State: AOJu0YyX9dc0l0TnMvSEJ5yh3hhNEouX/GG7uPnYbp0df+aAwFNlvFNc FOgCk/t0q/jE3J8x/S2c+s0= X-Received: by 2002:a5d:5904:0:b0:317:6579:2b9f with SMTP id v4-20020a5d5904000000b0031765792b9fmr3835926wrd.30.1695592347329; Sun, 24 Sep 2023 14:52:27 -0700 (PDT) Received: from spiri.. ([2a02:2f08:a301:7000:1bc9:cab8:e784:6ddb]) by smtp.gmail.com with ESMTPSA id c10-20020a5d4f0a000000b0031f3ad17b2csm10144444wru.52.2023.09.24.14.52.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:52:27 -0700 (PDT) From: alisadariana@gmail.com Cc: Alisa-Dariana Roman , Jonathan Cameron , Lars-Peter Clausen , Alexandru Tachici , Michael Hennerich , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] iio: adc: ad7192: Improve f_order computation Date: Mon, 25 Sep 2023 00:51:47 +0300 Message-Id: <20230924215148.102491-3-alisadariana@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230924215148.102491-1-alisadariana@gmail.com> References: <20230924215148.102491-1-alisadariana@gmail.com> MIME-Version: 1.0 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_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 14:52:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777957574078501292 X-GMAIL-MSGID: 1777957574078501292 From: Alisa-Dariana Roman Instead of using the f_order member of ad7192_state, a function that computes the f_order coefficient makes more sense. This coefficient is a function of the sinc filter and chop filter states. Remove f_order member of ad7192_state structure. Instead use ad7192_compute_f_order function to compute the f_order coefficient according to the sinc filter and chop filter states passed as parameters. Add ad7192_get_f_order function that returns the current f_order coefficient of the device. Add ad7192_compute_f_adc function that computes the f_adc value according to the sinc filter and chop filter states passed as parameters. Add ad7192_get_f_adc function that returns the current f_adc value of the device. Signed-off-by: Alisa-Dariana Roman --- drivers/iio/adc/ad7192.c | 62 +++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index d693f2ce8a20..0f9d33002d35 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -179,7 +179,6 @@ struct ad7192_state { struct clk *mclk; u16 int_vref_mv; u32 fclk; - u32 f_order; u32 mode; u32 conf; u32 scale_avail[8][2]; @@ -419,7 +418,6 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np) st->conf |= AD7192_CONF_REFSEL; st->conf &= ~AD7192_CONF_CHOP; - st->f_order = AD7192_NO_SYNC_FILTER; buf_en = of_property_read_bool(np, "adi,buffer-enable"); if (buf_en) @@ -530,22 +528,60 @@ static ssize_t ad7192_set(struct device *dev, return ret ? ret : len; } +static int ad7192_compute_f_order(bool sinc3_en, bool chop_en) +{ + if (!chop_en) + return 1; + + if (sinc3_en) + return AD7192_SYNC3_FILTER; + + return AD7192_SYNC4_FILTER; +} + +static int ad7192_get_f_order(struct ad7192_state *st) +{ + bool sinc3_en, chop_en; + + sinc3_en = FIELD_GET(AD7192_MODE_SINC3, st->mode); + chop_en = FIELD_GET(AD7192_CONF_CHOP, st->conf); + + return ad7192_compute_f_order(sinc3_en, chop_en); +} + +static int ad7192_compute_f_adc(struct ad7192_state *st, bool sinc3_en, + bool chop_en) +{ + unsigned int f_order = ad7192_compute_f_order(sinc3_en, chop_en); + + return DIV_ROUND_CLOSEST(st->fclk, + f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); +} + +static int ad7192_get_f_adc(struct ad7192_state *st) +{ + unsigned int f_order = ad7192_get_f_order(st); + + return DIV_ROUND_CLOSEST(st->fclk, + f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); +} + static void ad7192_get_available_filter_freq(struct ad7192_state *st, int *freq) { unsigned int fadc; /* Formulas for filter at page 25 of the datasheet */ - fadc = DIV_ROUND_CLOSEST(st->fclk, - AD7192_SYNC4_FILTER * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); + fadc = ad7192_compute_f_adc(st, false, true); freq[0] = DIV_ROUND_CLOSEST(fadc * 240, 1024); - fadc = DIV_ROUND_CLOSEST(st->fclk, - AD7192_SYNC3_FILTER * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); + fadc = ad7192_compute_f_adc(st, true, true); freq[1] = DIV_ROUND_CLOSEST(fadc * 240, 1024); - fadc = DIV_ROUND_CLOSEST(st->fclk, FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); + fadc = ad7192_compute_f_adc(st, false, false); freq[2] = DIV_ROUND_CLOSEST(fadc * 230, 1024); + + fadc = ad7192_compute_f_adc(st, true, false); freq[3] = DIV_ROUND_CLOSEST(fadc * 272, 1024); } @@ -628,25 +664,21 @@ static int ad7192_set_3db_filter_freq(struct ad7192_state *st, switch (idx) { case 0: - st->f_order = AD7192_SYNC4_FILTER; st->mode &= ~AD7192_MODE_SINC3; st->conf |= AD7192_CONF_CHOP; break; case 1: - st->f_order = AD7192_SYNC3_FILTER; st->mode |= AD7192_MODE_SINC3; st->conf |= AD7192_CONF_CHOP; break; case 2: - st->f_order = AD7192_NO_SYNC_FILTER; st->mode &= ~AD7192_MODE_SINC3; st->conf &= ~AD7192_CONF_CHOP; break; case 3: - st->f_order = AD7192_NO_SYNC_FILTER; st->mode |= AD7192_MODE_SINC3; st->conf &= ~AD7192_CONF_CHOP; @@ -664,8 +696,7 @@ static int ad7192_get_3db_filter_freq(struct ad7192_state *st) { unsigned int fadc; - fadc = DIV_ROUND_CLOSEST(st->fclk, - st->f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); + fadc = ad7192_get_f_adc(st); if (FIELD_GET(AD7192_CONF_CHOP, st->conf)) return DIV_ROUND_CLOSEST(fadc * 240, 1024); @@ -713,8 +744,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, *val -= 273 * ad7192_get_temp_scale(unipolar); return IIO_VAL_INT; case IIO_CHAN_INFO_SAMP_FREQ: - *val = st->fclk / - (st->f_order * 1024 * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); + *val = DIV_ROUND_CLOSEST(ad7192_get_f_adc(st), 1024); return IIO_VAL_INT; case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: *val = ad7192_get_3db_filter_freq(st); @@ -764,7 +794,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, break; } - div = st->fclk / (val * st->f_order * 1024); + div = st->fclk / (val * ad7192_get_f_order(st) * 1024); if (div < 1 || div > 1023) { ret = -EINVAL; break; From patchwork Sun Sep 24 21:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 144148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp853027vqu; Sun, 24 Sep 2023 14:54:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGHlKdxLUCeKKPxC3UN3QNG00LZFyz+0vdfwu2SfSh8X7E9V+VrSA4HcsUSvay77l2aMiSQ X-Received: by 2002:a25:86d1:0:b0:d84:2619:56ea with SMTP id y17-20020a2586d1000000b00d84261956eamr4259926ybm.51.1695592477596; Sun, 24 Sep 2023 14:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695592477; cv=none; d=google.com; s=arc-20160816; b=ZthQzEkYikAaNGQWUnVAzeTYbwWoRMOJMGucPGrx1LaRFf2aSH8JDcCaTxeIs2Vy2z CB0T5KGDIK0fFxqO497wZ1GIQuse+fUCpp3CWeUvYWtzcB/b54onpFCfhH4o4kLp0eIz r+pTPYLnpw5g7l2Nxh8pADX5gAzQBUyWdObA1DP4aZWKPJIuxyTyWCaowneIjKDTCaem P9rGtXXLR/9Qzj0/TxIeeSxLtDSy+JV+ykPj9wQ9f5gT6rJPs3TEBrS9UZMhHeGfAlv6 5tsGYOKO0Qj6kfcLhv41F8YcBwfFOIv73hGvZNgjsGj6/fZvwoPO7dPnoGbV8NINTC7m kBAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=Sm3QFQM6KQv6uCCfjkS4IRkehQ2aS8upGUO2t0heBs4=; fh=1KgYFizM+vRXr+0lGj0+OdO2+2S32xt6A3DZ1Qd4gVY=; b=kWaAc0YWVG873htaSxtaUhOyXtSRNhGjQIdgMsW9mlk3J7zj7WsipnrF+HqE9mAG34 aZ6O4m9SXdiUUg84/wFix+/8LDBV3/R1+khnyIqDeKmS1qqGVN+PXv4RDEpEWnYA6lvf dlo82mB+oWbWHaIR9zqFMxyUvCGNp9x8cld6aZXkrKiBh0tami94gCw8OkKO4N7V011R Eq5jkDME5fO9/2Pl5sCu6SD/wyHjPA+aitdwd0BcxHLmjDiKJODOh2RlXy9qj+iQj0OL +ocRnlq5anIeJZPsBue+dxR92qash8P94psh86IYNXbYT+hHCxYS6KkNyinOxjSGEDQZ q4rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=WwgzOtQE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id ca33-20020a056a0206a100b00565cc4508ffsi9199655pgb.367.2023.09.24.14.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:54:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20230601 header.b=WwgzOtQE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id D26F580C7AFC; Sun, 24 Sep 2023 14:52:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230186AbjIXVwn (ORCPT + 29 others); Sun, 24 Sep 2023 17:52:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230370AbjIXVwl (ORCPT ); Sun, 24 Sep 2023 17:52:41 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE06311B; Sun, 24 Sep 2023 14:52:32 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-405524e6769so16681085e9.1; Sun, 24 Sep 2023 14:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695592351; x=1696197151; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sm3QFQM6KQv6uCCfjkS4IRkehQ2aS8upGUO2t0heBs4=; b=WwgzOtQEIekG3tgsTKR+tkgF+TJ6tlzOzL5qAwc9/RP8I4q9jctuTWrRqLjlrG0RXe +ut2mtgikOHzcUTjCTI2EHiajGA+Yg8Ulh1ET/zrj8ahXgjObpgJM0t2S4XgcR/x8SlT W/u4E2pxoEf/hF6W+Ea9cYb+ZugIRPly9So9ax0g15j+uQ4f4uGWENUhUsG6Pgu6unwm PIC11uVvJrH4eik3AktkQRUVQtI/jPrx/U09VAoRbgefw8RHk2t6Xv0VCa4+DrX/RKz4 Dj0gQS8pJaD4Y8w0dWo3Cj7Tg7PXKqvDLQNrDMeD7+f6o6xijEO6zsA2AHgAJumLNdEJ fYug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695592351; x=1696197151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sm3QFQM6KQv6uCCfjkS4IRkehQ2aS8upGUO2t0heBs4=; b=o/yHVbo9AvxPHx+lLhvFBwbqan9FSxX4/jCRj+cdN7xBOTApXU0g3764HLjH+ZmH1d ivedI4p0TUMYo15sCmKPu1ILP0zQGSoA6FQN2j0DwSEMij3ZAbw5T1IRvYFEbDf7MsFx Bm7ZYpytdJwmK6kfWhvZaOYG1LCi0SQh1h2+pPYO+cmLdZ8EyIIrzGJAv7xK2BBDLP6p UGQVw9apBujpiPiGY3RjR2RaC9iLvhhiTvr/o1pqNr14iLafaPb3s5oZYUPAjjTpz0a6 qD88+nEoXuvZhpPIjIIi9y2SZL0BWs/kNSn13gmqBo2FsoS6+5TlOXkgXZnM4qz4qi92 l1nw== X-Gm-Message-State: AOJu0YwLWg10iALJy7UTG253Ci1N+V/LRaF+3xrzXKHkcq34P7Hz7sf2 +5e5RJkbN3tbXuSCZEb+hXg= X-Received: by 2002:a1c:4b1a:0:b0:3fe:1fd9:bedf with SMTP id y26-20020a1c4b1a000000b003fe1fd9bedfmr3824047wma.11.1695592351142; Sun, 24 Sep 2023 14:52:31 -0700 (PDT) Received: from spiri.. ([2a02:2f08:a301:7000:1bc9:cab8:e784:6ddb]) by smtp.gmail.com with ESMTPSA id c10-20020a5d4f0a000000b0031f3ad17b2csm10144444wru.52.2023.09.24.14.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 14:52:30 -0700 (PDT) From: alisadariana@gmail.com Cc: Alisa-Dariana Roman , Jonathan Cameron , Lars-Peter Clausen , Alexandru Tachici , Michael Hennerich , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] iio: adc: ad7192: Add fast settling support Date: Mon, 25 Sep 2023 00:51:48 +0300 Message-Id: <20230924215148.102491-4-alisadariana@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230924215148.102491-1-alisadariana@gmail.com> References: <20230924215148.102491-1-alisadariana@gmail.com> MIME-Version: 1.0 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_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Sun, 24 Sep 2023 14:52:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777957577711354329 X-GMAIL-MSGID: 1777957577711354329 From: Alisa-Dariana Roman Add fast settling mode support for AD7193. Add fast_settling_average_factor attribute. Expose to user the current value of the fast settling average factor. User can change the value by writing a new one. Add fast_settling_average_factor_available attribute. Expose to user possible values for the fast settling average factor. Signed-off-by: Alisa-Dariana Roman --- .../ABI/testing/sysfs-bus-iio-adc-ad7192 | 18 +++ drivers/iio/adc/ad7192.c | 128 ++++++++++++++++-- 2 files changed, 134 insertions(+), 12 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 b/Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 index f8315202c8f0..780c6841b0c3 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 +++ b/Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 @@ -19,6 +19,24 @@ Description: the bridge can be disconnected (when it is not being used using the bridge_switch_en attribute. +What: /sys/bus/iio/devices/iio:deviceX/fast_settling_average_factor +KernelVersion: +Contact: linux-iio@vger.kernel.org +Description: + This attribute, if available, is used to activate or deactivate + fast settling mode and set the value of the average factor to + 1, 2, 8 or 16. If the average factor is set to 1, the fast + settling mode is disabled. The data from the sinc filter is + averaged by chosen value. The averaging reduces the output data + rate for a given FS word, however, the RMS noise improves. + +What: /sys/bus/iio/devices/iio:deviceX/fast_settling_average_factor_available +KernelVersion: +Contact: linux-iio@vger.kernel.org +Description: + Reading returns a list with the possible values for the fast + settling average factor: 1, 2, 8, 16. + What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration KernelVersion: Contact: linux-iio@vger.kernel.org diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index 0f9d33002d35..3b7de23b024e 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -60,6 +60,8 @@ #define AD7192_MODE_SEL_MASK GENMASK(23, 21) /* Operation Mode Select Mask */ #define AD7192_MODE_STA_MASK BIT(20) /* Status Register transmission Mask */ #define AD7192_MODE_CLKSRC_MASK GENMASK(19, 18) /* Clock Source Select Mask */ +#define AD7192_MODE_AVG_MASK GENMASK(17, 16) + /* Fast Settling Filter Average Select Mask (AD7193 only) */ #define AD7192_MODE_SINC3 BIT(15) /* SINC3 Filter Select */ #define AD7192_MODE_ENPAR BIT(13) /* Parity Enable */ #define AD7192_MODE_CLKDIV BIT(12) /* Clock divide by 2 (AD7190/2 only)*/ @@ -182,6 +184,7 @@ struct ad7192_state { u32 mode; u32 conf; u32 scale_avail[8][2]; + u8 avg_avail[4]; u8 gpocon; u8 clock_sel; struct mutex lock; /* protect sensor state */ @@ -459,6 +462,13 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device_node *np) st->scale_avail[i][0] = scale_uv; } + if (st->chip_info->chip_id == CHIPID_AD7193) { + st->avg_avail[0] = 1; + st->avg_avail[1] = 2; + st->avg_avail[2] = 8; + st->avg_avail[3] = 16; + } + return 0; } @@ -483,6 +493,18 @@ static ssize_t ad7192_show_bridge_switch(struct device *dev, FIELD_GET(AD7192_GPOCON_BPDSW, st->gpocon)); } +static ssize_t ad7192_show_average_factor(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct ad7192_state *st = iio_priv(indio_dev); + u8 avg_factor_index; + + avg_factor_index = FIELD_GET(AD7192_MODE_AVG_MASK, st->mode); + return sysfs_emit(buf, "%d\n", st->avg_avail[avg_factor_index]); +} + static ssize_t ad7192_set(struct device *dev, struct device_attribute *attr, const char *buf, @@ -491,12 +513,10 @@ static ssize_t ad7192_set(struct device *dev, struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct ad7192_state *st = iio_priv(indio_dev); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); + bool val, ret_einval; + u8 val_avg_factor; + unsigned int i; int ret; - bool val; - - ret = kstrtobool(buf, &val); - if (ret < 0) - return ret; ret = iio_device_claim_direct_mode(indio_dev); if (ret) @@ -504,6 +524,10 @@ static ssize_t ad7192_set(struct device *dev, switch ((u32)this_attr->address) { case AD7192_REG_GPOCON: + ret = kstrtobool(buf, &val); + if (ret < 0) + return ret; + if (val) st->gpocon |= AD7192_GPOCON_BPDSW; else @@ -512,6 +536,10 @@ static ssize_t ad7192_set(struct device *dev, ad_sd_write_reg(&st->sd, AD7192_REG_GPOCON, 1, st->gpocon); break; case AD7192_REG_CONF: + ret = kstrtobool(buf, &val); + if (ret < 0) + return ret; + if (val) st->conf |= AD7192_CONF_ACX; else @@ -519,6 +547,27 @@ static ssize_t ad7192_set(struct device *dev, ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, st->conf); break; + case AD7192_REG_MODE: + ret = kstrtou8(buf, 10, &val_avg_factor); + if (ret < 0) + return ret; + + ret_einval = true; + for (i = 0; i < ARRAY_SIZE(st->avg_avail); i++) { + if (val_avg_factor == st->avg_avail[i]) { + st->mode &= ~AD7192_MODE_AVG_MASK; + st->mode |= FIELD_PREP(AD7192_MODE_AVG_MASK, i); + ret_einval = false; + } + } + + if (ret_einval) + return -EINVAL; + + ret = ad_sd_write_reg(&st->sd, AD7192_REG_MODE, 3, st->mode); + if (ret) + return ret; + break; default: ret = -EINVAL; } @@ -528,15 +577,22 @@ static ssize_t ad7192_set(struct device *dev, return ret ? ret : len; } -static int ad7192_compute_f_order(bool sinc3_en, bool chop_en) +static int ad7192_compute_f_order(struct ad7192_state *st, bool sinc3_en, bool chop_en) { - if (!chop_en) + u8 avg_factor; + u8 avg_factor_selected; + + avg_factor_selected = FIELD_GET(AD7192_MODE_AVG_MASK, st->mode); + + if (!avg_factor_selected && !chop_en) return 1; + avg_factor = st->avg_avail[avg_factor_selected]; + if (sinc3_en) - return AD7192_SYNC3_FILTER; + return AD7192_SYNC3_FILTER + avg_factor - 1; - return AD7192_SYNC4_FILTER; + return AD7192_SYNC4_FILTER + avg_factor - 1; } static int ad7192_get_f_order(struct ad7192_state *st) @@ -546,13 +602,13 @@ static int ad7192_get_f_order(struct ad7192_state *st) sinc3_en = FIELD_GET(AD7192_MODE_SINC3, st->mode); chop_en = FIELD_GET(AD7192_CONF_CHOP, st->conf); - return ad7192_compute_f_order(sinc3_en, chop_en); + return ad7192_compute_f_order(st, sinc3_en, chop_en); } static int ad7192_compute_f_adc(struct ad7192_state *st, bool sinc3_en, bool chop_en) { - unsigned int f_order = ad7192_compute_f_order(sinc3_en, chop_en); + unsigned int f_order = ad7192_compute_f_order(st, sinc3_en, chop_en); return DIV_ROUND_CLOSEST(st->fclk, f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); @@ -605,9 +661,29 @@ static ssize_t ad7192_show_filter_avail(struct device *dev, return len; } +static ssize_t ad7192_show_avg_factor_avail(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct ad7192_state *st = iio_priv(indio_dev); + unsigned int i; + size_t len = 0; + + for (i = 0; i < ARRAY_SIZE(st->avg_avail); i++) + len += sysfs_emit_at(buf, len, "%d ", st->avg_avail[i]); + + buf[len - 1] = '\n'; + + return len; +} + static IIO_DEVICE_ATTR(filter_low_pass_3db_frequency_available, 0444, ad7192_show_filter_avail, NULL, 0); +static IIO_DEVICE_ATTR(fast_settling_average_factor_available, + 0444, ad7192_show_avg_factor_avail, NULL, 0); + static IIO_DEVICE_ATTR(bridge_switch_en, 0644, ad7192_show_bridge_switch, ad7192_set, AD7192_REG_GPOCON); @@ -616,6 +692,10 @@ static IIO_DEVICE_ATTR(ac_excitation_en, 0644, ad7192_show_ac_excitation, ad7192_set, AD7192_REG_CONF); +static IIO_DEVICE_ATTR(fast_settling_average_factor, 0644, + ad7192_show_average_factor, ad7192_set, + AD7192_REG_MODE); + static struct attribute *ad7192_attributes[] = { &iio_dev_attr_filter_low_pass_3db_frequency_available.dev_attr.attr, &iio_dev_attr_bridge_switch_en.dev_attr.attr, @@ -626,6 +706,18 @@ static const struct attribute_group ad7192_attribute_group = { .attrs = ad7192_attributes, }; +static struct attribute *ad7193_attributes[] = { + &iio_dev_attr_filter_low_pass_3db_frequency_available.dev_attr.attr, + &iio_dev_attr_bridge_switch_en.dev_attr.attr, + &iio_dev_attr_fast_settling_average_factor.dev_attr.attr, + &iio_dev_attr_fast_settling_average_factor_available.dev_attr.attr, + NULL +}; + +static const struct attribute_group ad7193_attribute_group = { + .attrs = ad7193_attributes, +}; + static struct attribute *ad7195_attributes[] = { &iio_dev_attr_filter_low_pass_3db_frequency_available.dev_attr.attr, &iio_dev_attr_bridge_switch_en.dev_attr.attr, @@ -882,6 +974,16 @@ static const struct iio_info ad7192_info = { .update_scan_mode = ad7192_update_scan_mode, }; +static const struct iio_info ad7193_info = { + .read_raw = ad7192_read_raw, + .write_raw = ad7192_write_raw, + .write_raw_get_fmt = ad7192_write_raw_get_fmt, + .read_avail = ad7192_read_avail, + .attrs = &ad7193_attribute_group, + .validate_trigger = ad_sd_validate_trigger, + .update_scan_mode = ad7192_update_scan_mode, +}; + static const struct iio_info ad7195_info = { .read_raw = ad7192_read_raw, .write_raw = ad7192_write_raw, @@ -1056,7 +1158,9 @@ static int ad7192_probe(struct spi_device *spi) if (ret < 0) return ret; - if (st->chip_info->chip_id == CHIPID_AD7195) + if (st->chip_info->chip_id == CHIPID_AD7193) + indio_dev->info = &ad7193_info; + else if (st->chip_info->chip_id == CHIPID_AD7195) indio_dev->info = &ad7195_info; else indio_dev->info = &ad7192_info;