From patchwork Sat Apr 13 15:11:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 13628703 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BC52262BD; Sat, 13 Apr 2024 15:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021167; cv=none; b=Ek6MXH0KfoCgJwJ4XM7NgyimlgCf82yfuwg4rcxhhw9sOXAv2G6sNezjLGee4X4MqM96kwzWBNow/RdH3scP/zJWs0Tgfdvjwkdb4xi7/q6Byj5TvEPUFG6tfQcBAZsHOePDxdRyPiDzwEjAbTKN62gsnt7omPRHGAc9m4evQTM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021167; c=relaxed/simple; bh=O22EJf3Cxd7LhuWpyhu2TN+qJKoijknx7evp3ZrZrhI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R4vpDiU37xu3RQkhxf9AG7Oj0au36rXIMN5AOCuYNsD0OsWFB4OmkSzV6Z7FbtMFnBsl8DGpMdFHXRUv1HIXjdLrqlmBL+Xw3bqoqLXHVQ8c+spxwcvE8eaeMJmp9hI5QeWynVClsOmsTh083CXgKgYOhk32u/pKyw6Iqeezn8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UXnFYjZi; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UXnFYjZi" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-56fffb1d14bso2413167a12.1; Sat, 13 Apr 2024 08:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021164; x=1713625964; 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=rrAIbGvl062V/H8+KEradezmbkKsOapNvn4Za0W1owY=; b=UXnFYjZiUz+bVNVmPfBnnVB5aMzJJqleVloBbY7sOnbGQ3M0D9H7oqqHcCcsRFR0Vi mz2aUKCE90FcaLTZtR7dmCWTKpw00ee/+iC7Z/hvXbQiUJNQKI1OyMSeCRjWTgLypiSo Yn9o2E7UCTSCClVOk1GsUeiidjy1Zv4MU5GQP2R54u6BCicToi2gvzlOYvsW/NnvafQB SwlyVFn80zdYrOYcIImx8botxiDv/tu0Tr19NKbFC+rAcafEJYLT9q/AF3mh0xp2y4ea v79Nz6JmMLhZjRNvIEebStxzHPEj5tEpAWbihEbZGDQ+5u2rGigDC96+yI0c6Q6EnyBe CT2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021164; x=1713625964; 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=rrAIbGvl062V/H8+KEradezmbkKsOapNvn4Za0W1owY=; b=VUMPw35EjQPSjgaxCOQZxa/7WGYT1b22QD4WTAn1uvglrn2fqKFNjrrJEg7mrc03ug 3h1qDoT2cx+RU/Uwnfjm6DXPQ4qRCAJgjWYEyHmGj+Bi8Ih8WWPvMrlHxoOiDGabtwc3 utk5rBeUMJ7k3LQAez+Ea5E0MgK9UMSTglf5lIvUgRvoEKCFSbTk9oWrYEqdmq6fft5h 8rLUr1d1MaaeIAtkkswpg/8NVI11a6aqzgCeU1eDwCpj5Vnk0nqIF6c3I8Y6Uvm8SZRX jNUAqCX27U2bDnMAzc6SQmSOUj4LhCzuIVO/MRw+Jzz3MiEzcLWPQU8fYasiZN1NLuy6 udCg== X-Forwarded-Encrypted: i=1; AJvYcCWN2AC3+CDIl2QISUCZ1/hQk6/TS/MBCJtQrlyMHAXL+wTf4W0m7QXIq+Lj5akm+mF1vqwVBFUxaC84SJegxA2k83iy2JjXXJ7pUhgxxJEQQnydhEsx3Mdl+k0whBbps8ufs0e5GnwMammVJJctGCwqOWQ2FIBlp8ZxyGRGNnWiLoejLQ== X-Gm-Message-State: AOJu0YzLZtq7fLSiRzOHCChAFMbjT8d8hvIhI2EKBF3bvm8zJ5I9iMUT jlkxdglbHS5Z2oCEs+Z7NqwVdf39Rs9fHys/p9EhT+B/ugYOhY+3 X-Google-Smtp-Source: AGHT+IHoFqeoePISpFGsB074XF4BvxBF7Y4J0uSPtGuravVIiwQfD+AEvdW0dsUX5/ICFcaKh3kNKg== X-Received: by 2002:a05:6402:380c:b0:56e:2b41:32c7 with SMTP id es12-20020a056402380c00b0056e2b4132c7mr6173192edb.10.1713021163869; Sat, 13 Apr 2024 08:12:43 -0700 (PDT) Received: from spiri.. ([5.14.146.31]) by smtp.gmail.com with ESMTPSA id w4-20020a056402128400b0056e2b351956sm2749883edv.22.2024.04.13.08.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:12:43 -0700 (PDT) From: Alisa-Dariana Roman X-Google-Original-From: Alisa-Dariana Roman To: michael.hennerich@analog.com, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alexandru.tachici@analog.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, andy@kernel.org, nuno.sa@analog.com, marcelo.schmitt@analog.com, bigunclemax@gmail.com, dlechner@baylibre.com, okan.sahin@analog.com, fr0st61te@gmail.com, alisa.roman@analog.com, marcus.folkesson@gmail.com, schnelle@linux.ibm.com, liambeguin@gmail.com Subject: [PATCH v5 1/5] iio: adc: ad7192: Use standard attribute Date: Sat, 13 Apr 2024 18:11:48 +0300 Message-Id: <20240413151152.165682-2-alisa.roman@analog.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413151152.165682-1-alisa.roman@analog.com> References: <20240413151152.165682-1-alisa.roman@analog.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace custom attribute filter_low_pass_3db_frequency_available with standard attribute. Store the available values in ad7192_state struct. The function that used to compute those values replaced by ad7192_update_filter_freq_avail(). Function ad7192_show_filter_avail() is no longer needed. Note that the initial available values are hardcoded. Signed-off-by: Alisa-Dariana Roman Reviewed-by: David Lechner --- drivers/iio/adc/ad7192.c | 67 ++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index 7bcc7e2aa2a2..ac737221beae 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -190,6 +190,7 @@ struct ad7192_state { u32 mode; u32 conf; u32 scale_avail[8][2]; + u32 filter_freq_avail[4][2]; u32 oversampling_ratio_avail[4]; u8 gpocon; u8 clock_sel; @@ -473,6 +474,16 @@ static int ad7192_setup(struct iio_dev *indio_dev, struct device *dev) st->oversampling_ratio_avail[2] = 8; st->oversampling_ratio_avail[3] = 16; + st->filter_freq_avail[0][0] = 600; + st->filter_freq_avail[1][0] = 800; + st->filter_freq_avail[2][0] = 2300; + st->filter_freq_avail[3][0] = 2720; + + st->filter_freq_avail[0][1] = 1000; + st->filter_freq_avail[1][1] = 1000; + st->filter_freq_avail[2][1] = 1000; + st->filter_freq_avail[3][1] = 1000; + return 0; } @@ -586,48 +597,24 @@ static int ad7192_get_f_adc(struct ad7192_state *st) f_order * FIELD_GET(AD7192_MODE_RATE_MASK, st->mode)); } -static void ad7192_get_available_filter_freq(struct ad7192_state *st, - int *freq) +static void ad7192_update_filter_freq_avail(struct ad7192_state *st) { unsigned int fadc; /* Formulas for filter at page 25 of the datasheet */ fadc = ad7192_compute_f_adc(st, false, true); - freq[0] = DIV_ROUND_CLOSEST(fadc * 240, 1024); + st->filter_freq_avail[0][0] = DIV_ROUND_CLOSEST(fadc * 240, 1024); fadc = ad7192_compute_f_adc(st, true, true); - freq[1] = DIV_ROUND_CLOSEST(fadc * 240, 1024); + st->filter_freq_avail[1][0] = DIV_ROUND_CLOSEST(fadc * 240, 1024); fadc = ad7192_compute_f_adc(st, false, false); - freq[2] = DIV_ROUND_CLOSEST(fadc * 230, 1024); + st->filter_freq_avail[2][0] = DIV_ROUND_CLOSEST(fadc * 230, 1024); fadc = ad7192_compute_f_adc(st, true, false); - freq[3] = DIV_ROUND_CLOSEST(fadc * 272, 1024); + st->filter_freq_avail[3][0] = DIV_ROUND_CLOSEST(fadc * 272, 1024); } -static ssize_t ad7192_show_filter_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 freq_avail[4], i; - size_t len = 0; - - ad7192_get_available_filter_freq(st, freq_avail); - - for (i = 0; i < ARRAY_SIZE(freq_avail); i++) - len += sysfs_emit_at(buf, len, "%d.%03d ", freq_avail[i] / 1000, - freq_avail[i] % 1000); - - 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(bridge_switch_en, 0644, ad7192_show_bridge_switch, ad7192_set, AD7192_REG_GPOCON); @@ -637,7 +624,6 @@ static IIO_DEVICE_ATTR(ac_excitation_en, 0644, AD7192_REG_CONF); 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, NULL }; @@ -647,7 +633,6 @@ static const struct attribute_group ad7192_attribute_group = { }; 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, &iio_dev_attr_ac_excitation_en.dev_attr.attr, NULL @@ -665,17 +650,15 @@ static unsigned int ad7192_get_temp_scale(bool unipolar) static int ad7192_set_3db_filter_freq(struct ad7192_state *st, int val, int val2) { - int freq_avail[4], i, ret, freq; + int i, ret, freq; unsigned int diff_new, diff_old; int idx = 0; diff_old = U32_MAX; freq = val * 1000 + val2; - ad7192_get_available_filter_freq(st, freq_avail); - - for (i = 0; i < ARRAY_SIZE(freq_avail); i++) { - diff_new = abs(freq - freq_avail[i]); + for (i = 0; i < ARRAY_SIZE(st->filter_freq_avail); i++) { + diff_new = abs(freq - st->filter_freq_avail[i][0]); if (diff_new < diff_old) { diff_old = diff_new; idx = i; @@ -826,6 +809,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, 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); + ad7192_update_filter_freq_avail(st); break; case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: ret = ad7192_set_3db_filter_freq(st, val, val2 / 1000); @@ -846,6 +830,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev, break; } mutex_unlock(&st->lock); + ad7192_update_filter_freq_avail(st); break; default: ret = -EINVAL; @@ -888,6 +873,12 @@ static int ad7192_read_avail(struct iio_dev *indio_dev, /* Values are stored in a 2D matrix */ *length = ARRAY_SIZE(st->scale_avail) * 2; + return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: + *vals = (int *)st->filter_freq_avail; + *type = IIO_VAL_FRACTIONAL; + *length = ARRAY_SIZE(st->filter_freq_avail) * 2; + return IIO_AVAIL_LIST; case IIO_CHAN_INFO_OVERSAMPLING_RATIO: *vals = (int *)st->oversampling_ratio_avail; @@ -956,7 +947,9 @@ static const struct iio_info ad7195_info = { BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) | \ (_mask_all), \ .info_mask_shared_by_type_available = (_mask_type_av), \ - .info_mask_shared_by_all_available = (_mask_all_av), \ + .info_mask_shared_by_all_available = \ + BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) | \ + (_mask_all_av), \ .ext_info = (_ext_info), \ .scan_index = (_si), \ .scan_type = { \ From patchwork Sat Apr 13 15:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 13628704 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 493111F94C; Sat, 13 Apr 2024 15:12:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021175; cv=none; b=p8BHyY8BVebT66z/SptQ2QqEbNlJ6gxJVfPdSFe9swo24UZEaM79xR0eYPS7pLdk2HuPXApQQTpzt6W4R592f7/H47T9irJ9p8d01JWubfJ51EDmEkscYGOIA8XDQTvMqbUDsyEvkWnOqygkb0yQLQgCi9EeNfUkWHN9XVc//MQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021175; c=relaxed/simple; bh=7DFxNs6cCw28WpWPlFtO5E2+9N80ZigYuLgXuDTJF8o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XYfmQNLwNPVjgDgxkdrzrPZIBHvxwCz9iHHmU/wrGWKpoh5U5tuCmc5u3oBSw+8AQs9DDr6K+MbR/zVGyS2VjXkFV/q5ljGUsJQwu3ox3yfQK7GkNFCbmCmxIwhgZAKwHbIFKZJaReeE/iQHS3JvJH9LGciTrXMMXznsttjj+mQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Vf4/L0JM; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vf4/L0JM" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-56e37503115so1472896a12.1; Sat, 13 Apr 2024 08:12:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021172; x=1713625972; 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=GBb11tvx+5eI8LczNJrgwOTTPkpu4Q5YHuvpeo/+GrM=; b=Vf4/L0JM6DDX5TnUXKplsehsvWVtdso+6HNOJPOqmPbNQXXFLJgGADHqYolWCM9E25 mCE4gI+vikkzXZhthfHxx50SAaJGnmlZ0O4bAKhrxB1vR5B8VNW8EhEFrNWNcjnYp9KO msr1v9odo/Z26f8FnDXRsEk5xMDzs7nFno/LMy8FIsMsxBmP2GHyoXPx8kg81crOZn17 dvXoXFjD81hsiZLxgKqe0PXA3twxFjIBRKbAqnNovQ57QCWxS6dlnbcwnHbKYlQIYWC7 mkzo5Vo1TFw5Jq2KOJy1w3n2Ij70KNYh0UyamsHiTwIM5GoKiz54aV9cFx0JLLnvK5bA Qw1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021172; x=1713625972; 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=GBb11tvx+5eI8LczNJrgwOTTPkpu4Q5YHuvpeo/+GrM=; b=krk9o1rz/i3Z1fBMb9CgOdfh2d3IBr4jQGbSX0ppAo4tvKikIyXkc4SZLuZV7AsuiY 22ydD80p6rA5dgSoNF/rMB/B8gQrMo5t1Fu0bRuOmFI1hU4iticNu27Ksc2j5ACdZdT8 ThrGluWV+eSVVNAwkfMOWle4JXKM/nQmkiDkjReXbqHjtt9wouIps4v8MVyrmhbASD0E o0VNKY663osEUrUcKjRylbdNgwM4/J0HIhgynXnhxGtYtze4GDBHnmyl0l2xul/aoAI/ Mn8eJ8smrfBT6kkAOgK0B2LSalEjoibr2OmzYyWyo5c2mfUx/00qe33LKcjZKnk2kiv3 2SVw== X-Forwarded-Encrypted: i=1; AJvYcCVfWRDgo7rgQvrMnBU04oFBXw1oZ/TEpWFn7KcRSlHMYpYggcCW/QLGsBIIXPE8s23uT1v20/TWv1/0JUcQdVvUtSlA7Qyfp0n7pIIgVnF+/pHptjhwRZOnX1K7s20Pj7dgeAkVWYkrRjDmABdDGKJyDc9eAl6wEwtn+vtEwNQlU27Duw== X-Gm-Message-State: AOJu0YwdQGrlUtK+73adN9T1wgfWP4AX4tVs7RtkSeLvoQTU70p0kj5i c3RD7Vpj2KAGe05kLcdWfbBaNlG04MGEmouP2MpblP5Izy1YZpjN X-Google-Smtp-Source: AGHT+IGYMOu3Gkzq5afKgGUw+AgREB9x270AgBtuh2/Bwqk3fdetT/jgQXBB2GariPF7W6U0MVV1VQ== X-Received: by 2002:a50:d4d8:0:b0:56d:f075:72f6 with SMTP id e24-20020a50d4d8000000b0056df07572f6mr2750727edj.40.1713021172473; Sat, 13 Apr 2024 08:12:52 -0700 (PDT) Received: from spiri.. ([5.14.146.31]) by smtp.gmail.com with ESMTPSA id w4-20020a056402128400b0056e2b351956sm2749883edv.22.2024.04.13.08.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:12:52 -0700 (PDT) From: Alisa-Dariana Roman X-Google-Original-From: Alisa-Dariana Roman To: michael.hennerich@analog.com, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alexandru.tachici@analog.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, andy@kernel.org, nuno.sa@analog.com, marcelo.schmitt@analog.com, bigunclemax@gmail.com, dlechner@baylibre.com, okan.sahin@analog.com, fr0st61te@gmail.com, alisa.roman@analog.com, marcus.folkesson@gmail.com, schnelle@linux.ibm.com, liambeguin@gmail.com Subject: [PATCH v5 2/5] dt-bindings: iio: adc: ad7192: Add aincom supply Date: Sat, 13 Apr 2024 18:11:49 +0300 Message-Id: <20240413151152.165682-3-alisa.roman@analog.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413151152.165682-1-alisa.roman@analog.com> References: <20240413151152.165682-1-alisa.roman@analog.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 AINCOM should actually be a supply. If present and it has a non-zero voltage, the pseudo-differential channels are configured as single-ended with an offset. Otherwise, they are configured as differential channels between AINx and AINCOM pins. Signed-off-by: Alisa-Dariana Roman --- .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml index 16def2985ab4..ba506af3b73e 100644 --- a/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml +++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml @@ -41,6 +41,14 @@ properties: interrupts: maxItems: 1 + aincom-supply: + description: | + Optional AINCOM voltage supply. If present and it has a non-zero voltage, + the pseudo-differential channels are configured as single-ended channels + with the AINCOM voltage as offset. Otherwise, the pseudo-differential + channels are configured as differential channels: voltageX-voltage0, with + AINCOM as the negative input. + dvdd-supply: description: DVdd voltage supply @@ -117,6 +125,7 @@ examples: clock-names = "mclk"; interrupts = <25 0x2>; interrupt-parent = <&gpio>; + aincom-supply = <&aincom>; dvdd-supply = <&dvdd>; avdd-supply = <&avdd>; vref-supply = <&vref>; From patchwork Sat Apr 13 15:11:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 13628705 Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF4171F94C; Sat, 13 Apr 2024 15:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021182; cv=none; b=ZEFWNFoq1TJdRAfFdylr/R4z7NHO2Of4eYf0raHyULWCUMP55E4lYtsrZHsB+dkXOdSMmdh3QGtaSE+pVKNbCWdYlFIOPuG/2pA+4y3JoWCxawVIVb8eW9vP/HZwGud75Za0lB1vM9R4uWKYwnRGhbW5L/XMM0vr8HcgQVqwTbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021182; c=relaxed/simple; bh=wRQKd+OE+WtU1aqxorCSyF5sYApDtk21C9X6bXgHsjU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FwLPfmthUf3hSkAh7D1TPWWjVsQgKpXmPqRUbarMzkvpG6m2RQASbhScrTO5k1S/rckLapxqVDGd8XJPnX6owQHPEXV2yv6f8ouv+enndA2NuKK1m/Rafm56BReA6UtSea/d6inD2ah6T4Cs3Vs3pFKzhqReEpZFLqDBoFXS+zo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R8YAG5je; arc=none smtp.client-ip=209.85.208.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R8YAG5je" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-56e1bbdb362so1818124a12.1; Sat, 13 Apr 2024 08:13:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021179; x=1713625979; 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=mi0tivdTQs7BmgSdyeZGLWoMbQWeDfDilLlJQQErMc8=; b=R8YAG5je4M9MTHF2Rrs2ARB/SIKtXqNNYpu2IUsSt6zhx4UJEQAbBttw8qT5FG1f5r El1nG8tSyFTXYBbZCISJ6592oVsRPz6bnaxTH3uDzSqVo8+fKYm5UtR3lGMGfUA5NDp1 5VsduYPQyutut7c5vIg/B2AjtkglBxi7xJoKQLnXh3TlSkcuWstyK4XeVAX2ec8LcsOB cCIKUZm4/qoOCofIcOFCLFOeAvLKRepL/D89sPH0+YquVHluAhh6rt0Rc/brYvsiU2vh yRKQ4G2+mVHl+luuQL6W9c9yNTr2Xn9++oUh4yfpBdpAzRlxwRcOEDAnxXdEF+1IzyEO 7r9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021179; x=1713625979; 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=mi0tivdTQs7BmgSdyeZGLWoMbQWeDfDilLlJQQErMc8=; b=aOhro+mCjE8Tu7Sto7nHfHoGV8ZgTRKBEtJwoMtOG2NaI8t7YwePq23r8d5z7TQGcN Jtk9VC1h5wWXQXeH+AdkWDuX9GVV9q9/4nBinIm/Lo5nj31eNd8pZASao2FxbqXlZSAL 0UJ0xEOYWsvjwdD7mXNyUT7MuJuiJbYETevkub082LheqaGTxnegrmT2s6KO/TGDztNT H6swz8i/ldxy1wBVayuhZCXTJktFK/9+NOfD4/v9l5VOJmn9t7UdiQ6zbO020/8j4ZjY 3zcC3mp3o29G1osqiLjZyPWjLbTDscU+kQuws3Mjv0LN8cMpqG5fJS25CGC5ty069gvq dhGA== X-Forwarded-Encrypted: i=1; AJvYcCXK6jefQYTsCTFk76Lj1UVnV8jHeSb0cEqRiemQ1Emg1eRa787x3zyCGgrm3BAxS1KfBgkJSC7Dpem/6Sw6pQXa+Jcc/hyJwcNnmIyiKQNpAoIfy7vp7yF3d+ODo5jDfpWDmwtik8Grff/y+FZGo+hVVSqAUA7B4sT7spvsacyfdtQGTg== X-Gm-Message-State: AOJu0YxZnjyaMwYk/eQeJGjAsERbO4FPDk2RsIKNRg+SvkD/NRKv5XR5 u4ny1vedzmydHqumhnpUhVbnwayy5ofjAyrCLbSv0BDyk9V1oLSn X-Google-Smtp-Source: AGHT+IF4uTmCgLJbUZhXPiWBltRDrnWYsDQkE+ZAZKpcRIghO/mcfTHXg+1MUd1GIV3sG1oy0YOiMQ== X-Received: by 2002:a50:8e52:0:b0:56c:4db:33f7 with SMTP id 18-20020a508e52000000b0056c04db33f7mr4982075edx.10.1713021179020; Sat, 13 Apr 2024 08:12:59 -0700 (PDT) Received: from spiri.. ([5.14.146.31]) by smtp.gmail.com with ESMTPSA id w4-20020a056402128400b0056e2b351956sm2749883edv.22.2024.04.13.08.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:12:58 -0700 (PDT) From: Alisa-Dariana Roman X-Google-Original-From: Alisa-Dariana Roman To: michael.hennerich@analog.com, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alexandru.tachici@analog.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, andy@kernel.org, nuno.sa@analog.com, marcelo.schmitt@analog.com, bigunclemax@gmail.com, dlechner@baylibre.com, okan.sahin@analog.com, fr0st61te@gmail.com, alisa.roman@analog.com, marcus.folkesson@gmail.com, schnelle@linux.ibm.com, liambeguin@gmail.com Subject: [PATCH v5 3/5] iio: adc: ad7192: Add aincom supply Date: Sat, 13 Apr 2024 18:11:50 +0300 Message-Id: <20240413151152.165682-4-alisa.roman@analog.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413151152.165682-1-alisa.roman@analog.com> References: <20240413151152.165682-1-alisa.roman@analog.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 AINCOM should actually be a supply. If present and it has a non-zero voltage, the pseudo-differential channels are configured as single-ended with an offset. Otherwise, they are configured as differential channels between AINx and AINCOM pins. Signed-off-by: Alisa-Dariana Roman --- drivers/iio/adc/ad7192.c | 53 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index ac737221beae..a9eb4fab39ca 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -175,7 +175,7 @@ enum { struct ad7192_chip_info { unsigned int chip_id; const char *name; - const struct iio_chan_spec *channels; + struct iio_chan_spec *channels; u8 num_channels; const struct iio_info *info; }; @@ -186,6 +186,7 @@ struct ad7192_state { struct regulator *vref; struct clk *mclk; u16 int_vref_mv; + u16 aincom_mv; u32 fclk; u32 mode; u32 conf; @@ -745,6 +746,9 @@ static int ad7192_read_raw(struct iio_dev *indio_dev, /* Kelvin to Celsius */ if (chan->type == IIO_TEMP) *val -= 273 * ad7192_get_temp_scale(unipolar); + else if (st->aincom_mv && chan->channel2 == -1) + *val += DIV_ROUND_CLOSEST_ULL((u64)st->aincom_mv * 1000000000, + st->scale_avail[gain][1]); return IIO_VAL_INT; case IIO_CHAN_INFO_SAMP_FREQ: *val = DIV_ROUND_CLOSEST(ad7192_get_f_adc(st), 1024); @@ -982,7 +986,7 @@ static const struct iio_info ad7195_info = { #define AD7193_CHANNEL(_si, _channel1, _address) \ AD7193_DIFF_CHANNEL(_si, _channel1, -1, _address) -static const struct iio_chan_spec ad7192_channels[] = { +static struct iio_chan_spec ad7192_channels[] = { AD719x_DIFF_CHANNEL(0, 1, 2, AD7192_CH_AIN1P_AIN2M), AD719x_DIFF_CHANNEL(1, 3, 4, AD7192_CH_AIN3P_AIN4M), AD719x_TEMP_CHANNEL(2, AD7192_CH_TEMP), @@ -994,7 +998,7 @@ static const struct iio_chan_spec ad7192_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(8), }; -static const struct iio_chan_spec ad7193_channels[] = { +static struct iio_chan_spec ad7193_channels[] = { AD7193_DIFF_CHANNEL(0, 1, 2, AD7193_CH_AIN1P_AIN2M), AD7193_DIFF_CHANNEL(1, 3, 4, AD7193_CH_AIN3P_AIN4M), AD7193_DIFF_CHANNEL(2, 5, 6, AD7193_CH_AIN5P_AIN6M), @@ -1048,11 +1052,27 @@ static void ad7192_reg_disable(void *reg) regulator_disable(reg); } +static int ad7192_config_channels(struct ad7192_state *st) +{ + struct iio_chan_spec *channels = st->chip_info->channels; + int i; + + if (!st->aincom_mv) + for (i = 0; i < st->chip_info->num_channels; i++) + if (channels[i].channel2 == -1) { + channels[i].differential = 1; + channels[i].channel2 = 0; + } + + return 0; +} + static int ad7192_probe(struct spi_device *spi) { struct ad7192_state *st; struct iio_dev *indio_dev; - int ret; + struct regulator *aincom; + int ret = 0; if (!spi->irq) { dev_err(&spi->dev, "no IRQ?\n"); @@ -1067,6 +1087,26 @@ static int ad7192_probe(struct spi_device *spi) mutex_init(&st->lock); + aincom = devm_regulator_get_optional(&spi->dev, "aincom"); + if (!IS_ERR(aincom)) { + ret = regulator_enable(aincom); + if (ret) { + dev_err(&spi->dev, "Failed to enable specified AINCOM supply\n"); + return ret; + } + + ret = devm_add_action_or_reset(&spi->dev, ad7192_reg_disable, aincom); + if (ret) + return ret; + + ret = regulator_get_voltage(aincom); + if (ret < 0) + return dev_err_probe(&spi->dev, ret, + "Device tree error, AINCOM voltage undefined\n"); + } + + st->aincom_mv = ret / 1000; + st->avdd = devm_regulator_get(&spi->dev, "avdd"); if (IS_ERR(st->avdd)) return PTR_ERR(st->avdd); @@ -1113,6 +1153,11 @@ static int ad7192_probe(struct spi_device *spi) st->int_vref_mv = ret / 1000; st->chip_info = spi_get_device_match_data(spi); + + ret = ad7192_config_channels(st); + if (ret) + return ret; + indio_dev->name = st->chip_info->name; indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = st->chip_info->channels; From patchwork Sat Apr 13 15:11:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 13628706 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A46194597E; Sat, 13 Apr 2024 15:13:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021192; cv=none; b=kqdQUYmqAlnVsUJwPwwerbGppCU/DCv3xOjOYFS9laeFqBAtgC7dFviVngFOBCoTd7lPPlqfsLD+nLpo8aNlDTiqg1izleDqIQXJ3gmswG6qCu5bXQdU6opuym+k6iXWFV1ujAYqBEiwYZbyeQByFrCd5vEJV44EdqGIdra4iFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021192; c=relaxed/simple; bh=l4OkHsjpSQbTmXssYW2Df8eVdehQqIlHb1Z2GfhQPSw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=axW8OGuQ7tAcZ+zvlIpkuM+I/pkVgTgIeTAiCfDt5RhWMImqIwu5bs+TGEvBOM0uetyKJjNFpOh7fJFnLgwVuxNRi4KADWWQixdX5De+tkI0pZr9W/2tKuSAPsH0269l+lxIZgVOsq9lfRC+NPgVMO3syzyVLcL1+qk9fYvPhM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YrM5Zfpk; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YrM5Zfpk" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-55a179f5fa1so1824095a12.0; Sat, 13 Apr 2024 08:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021189; x=1713625989; 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=/H3yNAmRll7TZn8gfKLPpJ0eOXKDcbG9K2aasqChDaM=; b=YrM5ZfpkQr2EZLvOje6VMzaJo0pBlweWWcnyBnzfomrlkcnmvOXtcLmxKcTCKTYNUR qUZmF7KdL56iL8PemP8uHykJWNwFFuyxLJveTirOj7RVvC9O9K9ZgvzlTmNOjXURrYsV RgmFK2MtQxVh0L8SdWxhQNT5AZfov0+YZxXgQnl0Tfy3Ghzfj/k5MsKImaN7d+5XTTyt HWNagSNBgi7/zIX1TWcfEk9ctvVv3VzXdVLb7aPrkrrJBI68IkfC12V6I+/2fggt/MUV WBymj3eAdmcN4f+n7XsO5DbaKgkepIct7EzQ/BFNjpnD3Nsdzt09mdVYjHpzsJhwjmME C8SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021189; x=1713625989; 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=/H3yNAmRll7TZn8gfKLPpJ0eOXKDcbG9K2aasqChDaM=; b=wRKBcnbq+4LuyjbiaIvDmG/rBHm5efpd39RWiARbFheOD7T0+rH4MnOiJ6tyGdWQp8 2ew0rlWgXh67NBtnJ9N/mzDg/yrkNcgPOQMZ6TaEX6/JM0QmVubKBEXiUzoOgLNkMxkm lgkE3Ueh3JsqWY+4ICiuJV6+JAPRGcERQ+560LCEskvKrPiw7CpArhHCBvGVuaCCBNMs GuIRysoKgcqARlo202m8bkawSwns8xBZbyxxPhn64HFiZZ/k1+tzE36ZNeF88IRFMwMh Y45Kb1a0PD8JzA2uSQxNcujjmpkJCCG9HgSKggUKC8n5cfcB55r0AheYmIgycneY2FDY ji0A== X-Forwarded-Encrypted: i=1; AJvYcCWgewle0ut7hkA63m2YW5doJVOr4B/hdsUte6favR9VXdy7xlYAADC5JbjzV6jnzE3UGnIb+gl6jEQ6RBhoAl4KRO2x7ggaiZYMFsmr5VZ2XDdARkwywzfxAbTqEKLTTqy7sK6y42b4rH77kwMTwjavjK2Ks5GUI1t6/ciwpS/pZMiXsQ== X-Gm-Message-State: AOJu0YyOEZGPvhtgHSuQIYG74Kb2PlVrQf7v/e0K0d1Peej/AGR7Z0rI 9vELb6Vwg/Isa0JbujzNv7ohtUuDEKY5PoX+87Zugn4nyO34i5+X X-Google-Smtp-Source: AGHT+IHNm5EcUeA+xRebq/oyVLetAsy+FqiyWj4vdPAuVvjVSd3RYbvporoNJUp2SUPudXAoVQHHKw== X-Received: by 2002:a50:9353:0:b0:56b:dd0f:52e0 with SMTP id n19-20020a509353000000b0056bdd0f52e0mr3498732eda.18.1713021188945; Sat, 13 Apr 2024 08:13:08 -0700 (PDT) Received: from spiri.. ([5.14.146.31]) by smtp.gmail.com with ESMTPSA id w4-20020a056402128400b0056e2b351956sm2749883edv.22.2024.04.13.08.13.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:13:08 -0700 (PDT) From: Alisa-Dariana Roman X-Google-Original-From: Alisa-Dariana Roman To: michael.hennerich@analog.com, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alexandru.tachici@analog.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, andy@kernel.org, nuno.sa@analog.com, marcelo.schmitt@analog.com, bigunclemax@gmail.com, dlechner@baylibre.com, okan.sahin@analog.com, fr0st61te@gmail.com, alisa.roman@analog.com, marcus.folkesson@gmail.com, schnelle@linux.ibm.com, liambeguin@gmail.com Subject: [PATCH v5 4/5] dt-bindings: iio: adc: ad7192: Add AD7194 support Date: Sat, 13 Apr 2024 18:11:51 +0300 Message-Id: <20240413151152.165682-5-alisa.roman@analog.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413151152.165682-1-alisa.roman@analog.com> References: <20240413151152.165682-1-alisa.roman@analog.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Unlike the other AD719Xs, AD7194 has configurable differential channels. The user can dynamically configure them in the devicetree. Also add an example for AD7194 devicetree. Signed-off-by: Alisa-Dariana Roman --- .../bindings/iio/adc/adi,ad7192.yaml | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml index ba506af3b73e..855f0a2d7d75 100644 --- a/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml +++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml @@ -21,8 +21,15 @@ properties: - adi,ad7190 - adi,ad7192 - adi,ad7193 + - adi,ad7194 - adi,ad7195 + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + reg: maxItems: 1 @@ -104,8 +111,43 @@ required: - spi-cpol - spi-cpha +patternProperties: + "^channel@[0-9]+$": + type: object + $ref: adc.yaml + unevaluatedProperties: false + + properties: + reg: + description: The channel index. + minimum: 1 + maximum: 256 + + diff-channels: + description: | + Both inputs can be connected to pins AIN1 to AIN16 by choosing the + appropriate value from 1 to 16. + items: + minimum: 1 + maximum: 16 + + required: + - reg + - diff-channels + allOf: - $ref: /schemas/spi/spi-peripheral-props.yaml# + - if: + properties: + compatible: + enum: + - adi,ad7190 + - adi,ad7192 + - adi,ad7193 + - adi,ad7195 + then: + patternProperties: + "^channel@[0-9]+$": false unevaluatedProperties: false @@ -136,3 +178,35 @@ examples: adi,burnout-currents-enable; }; }; + - | + spi { + #address-cells = <1>; + #size-cells = <0>; + + adc@0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "adi,ad7194"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + spi-cpha; + clocks = <&ad7192_mclk>; + clock-names = "mclk"; + interrupts = <25 0x2>; + interrupt-parent = <&gpio>; + dvdd-supply = <&dvdd>; + avdd-supply = <&avdd>; + vref-supply = <&vref>; + + channel@1 { + reg = <1>; + diff-channels = <1 6>; + }; + + channel@2 { + reg = <2>; + diff-channels = <16 5>; + }; + }; + }; From patchwork Sat Apr 13 15:11:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alisa-Dariana Roman X-Patchwork-Id: 13628707 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D64DC4597E; Sat, 13 Apr 2024 15:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021199; cv=none; b=cuFOu+kKk2eWiZV1JpLsDC4zbh+run6c0is733Zp6r6kISvnSj4SqfGIIgBnCqWPv0kTRfl2z8jPmUZzxrHm37KMGnLgAHeKYq8iMG5hISSAr1VEY0Kjr/dwqpVuheFrMWNHbOp2bS7nxIFNJ7YbouhzP6uNBhtpk8l7rG1vnn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713021199; c=relaxed/simple; bh=HOzFAL8yYAEMAgDOJ95pg4Wj7zWkAIIRw10A3SkOE0Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Gx2QrsJnVlBP/4KqKgCHkQWyerJIAl32cynjzA9uKcsYADC+/ynv7msoOiig2joFRefH64pJgVmC1wg64HdBfNN1PmERMCe/VCh8t+44PnCK9w5hpfuJLw5BKBSjmz4/r0ryl1eX0BpnJAmKwrxOuUDPYZ4880Q3p8Wz9QE5oZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Z1RCDhW+; arc=none smtp.client-ip=209.85.208.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z1RCDhW+" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-56e6a1edecfso2883487a12.1; Sat, 13 Apr 2024 08:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021196; x=1713625996; 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=kGBXZT9zN7ekVSL6HG3HPphozJFpFD+fpudeCxgE3nM=; b=Z1RCDhW+lhgIhUVTMaJtAhTZoRDdxp59dqtIeTQwt0YDgndbJMG3mgJQGyfYAzB9uq KcAK1tqf6bbW1n0lMfulM46YrMdxIPghZHjZ1SUQvEuetU+BJ6HXoC8nwXhhoFe+kiqJ zL/Q8vQw2qBbIj4sEBDGgyMvhAI6NmCx9NhRRYrBq7ghvIidVUucb6yJKbunH66/G1eZ V6ZN6LWXhlv1Jan5kjM2nfOyBQdXAC7YloFjasW2nhs+jCAko9OuktwA+klTNjDHbQ3g vQBTx1WnZxMxhqa54BvfJGfI+xDdJQ+laJdWrltkwObl6Z/QN+BB/7KWBqSBgb930g9i n3bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021196; x=1713625996; 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=kGBXZT9zN7ekVSL6HG3HPphozJFpFD+fpudeCxgE3nM=; b=ITJftT/aX4iFMxv46uY3PXFdkvStDw4q3LcWInHWBvVFoejOjfMQHnv/SejamtTNGX p/CiccSd4SOYKiEp/iUjUbqIypakY4GBUfML0cUEvUGt9dy0Ku03fR8LWj5slzx0uJuB spBo503WmjBC8igvKuWmHLjJhQnEoRBI6WNHAUtmYiiz1ed+GG4AhkeLXBm+CKK4ieRD hyRfgvIR8Lo1lWp2+pcgqQNyqw3sjXxxGH9eqsCbQPtHKYun2uKuf08rkXEEbfQyw3Iq QGrgMvreAO7E4oa8uYhoVLHmLoiZyrOZGV+kvTaA6lj1v90qC2HMg74dthQfO9mu2nBP y8cw== X-Forwarded-Encrypted: i=1; AJvYcCV0e15scrau7JXh/J83/6CqDiVIMTPeQyIW9qge6ny8tcYq4ZC7rL5q1vr09hnlzLKSSsddFQcXN5hzBUVTWS2WG00JeGdTKfCo4+hO4FwZN7pSimihkxyUiDg791O5vyimgG4QeyNaQBADWYEK0t84ttGMXC5Eknpqxmq7ucw4sKynhQ== X-Gm-Message-State: AOJu0YyB4jyLV0IzRjCX0iiMcG73ijOwTcyFOIEaDJA82X/WGb6dVQyc dANe8GfZOC4bpvGHcJrAByf2lpeln4S9sFRpwCrIL9Ks1FzeQbBg X-Google-Smtp-Source: AGHT+IGZTsb04Cb1Z3Fq6VjXL8jX9l295NRiV65Hfmc9gP5pFkhTU2P8PnBWm1KkJmcrnSB0Ocua/w== X-Received: by 2002:a50:9e4e:0:b0:56c:1db1:f9eb with SMTP id z72-20020a509e4e000000b0056c1db1f9ebmr4530504ede.19.1713021196065; Sat, 13 Apr 2024 08:13:16 -0700 (PDT) Received: from spiri.. ([5.14.146.31]) by smtp.gmail.com with ESMTPSA id w4-20020a056402128400b0056e2b351956sm2749883edv.22.2024.04.13.08.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:13:15 -0700 (PDT) From: Alisa-Dariana Roman X-Google-Original-From: Alisa-Dariana Roman To: michael.hennerich@analog.com, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: alexandru.tachici@analog.com, lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, andy@kernel.org, nuno.sa@analog.com, marcelo.schmitt@analog.com, bigunclemax@gmail.com, dlechner@baylibre.com, okan.sahin@analog.com, fr0st61te@gmail.com, alisa.roman@analog.com, marcus.folkesson@gmail.com, schnelle@linux.ibm.com, liambeguin@gmail.com Subject: [PATCH v5 5/5] iio: adc: ad7192: Add AD7194 support Date: Sat, 13 Apr 2024 18:11:52 +0300 Message-Id: <20240413151152.165682-6-alisa.roman@analog.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413151152.165682-1-alisa.roman@analog.com> References: <20240413151152.165682-1-alisa.roman@analog.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Unlike the other AD719Xs, AD7194 has configurable differential channels. The user can dynamically configure them in the devicetree. Also modify config AD7192 description for better scaling. Moved ad7192_chip_info struct definition to allow use of callback function parse_channels(). Signed-off-by: Alisa-Dariana Roman --- drivers/iio/adc/Kconfig | 11 ++- drivers/iio/adc/ad7192.c | 140 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 138 insertions(+), 13 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 8db68b80b391..74fecc284f1a 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -88,12 +88,17 @@ config AD7173 called ad7173. config AD7192 - tristate "Analog Devices AD7190 AD7192 AD7193 AD7195 ADC driver" + tristate "Analog Devices AD7192 and similar ADC driver" depends on SPI select AD_SIGMA_DELTA help - Say yes here to build support for Analog Devices AD7190, - AD7192, AD7193 or AD7195 SPI analog to digital converters (ADC). + Say yes here to build support for Analog Devices SPI analog to digital + converters (ADC): + - AD7190 + - AD7192 + - AD7193 + - AD7194 + - AD7195 If unsure, say N (but it's safe to say "Y"). To compile this driver as a module, choose M here: the diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c index a9eb4fab39ca..646ab56b87e3 100644 --- a/drivers/iio/adc/ad7192.c +++ b/drivers/iio/adc/ad7192.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * AD7190 AD7192 AD7193 AD7195 SPI ADC driver + * AD7192 and similar SPI ADC driver * * Copyright 2011-2015 Analog Devices Inc. */ @@ -128,10 +128,21 @@ #define AD7193_CH_AIN8 0x480 /* AIN7 - AINCOM */ #define AD7193_CH_AINCOM 0x600 /* AINCOM - AINCOM */ +#define AD7194_CH_POS(x) (((x) - 1) << 4) +#define AD7194_CH_NEG(x) ((x) - 1) +#define AD7194_CH_DIFF(pos, neg) \ + (((neg) == 0 ? BIT(10) : AD7194_CH_NEG(neg)) | AD7194_CH_POS(pos)) +#define AD7194_CH_TEMP 0x100 /* Temp sensor */ +#define AD7194_CH_BASE_NR 18 +#define AD7194_CH_AIN_START 1 +#define AD7194_CH_AIN_NR 16 +#define AD7194_CH_DIFF_NR_MAX 256 + /* ID Register Bit Designations (AD7192_REG_ID) */ #define CHIPID_AD7190 0x4 #define CHIPID_AD7192 0x0 #define CHIPID_AD7193 0x2 +#define CHIPID_AD7194 0x3 #define CHIPID_AD7195 0x6 #define AD7192_ID_MASK GENMASK(3, 0) @@ -169,17 +180,10 @@ enum { ID_AD7190, ID_AD7192, ID_AD7193, + ID_AD7194, ID_AD7195, }; -struct ad7192_chip_info { - unsigned int chip_id; - const char *name; - struct iio_chan_spec *channels; - u8 num_channels; - const struct iio_info *info; -}; - struct ad7192_state { const struct ad7192_chip_info *chip_info; struct regulator *avdd; @@ -201,6 +205,15 @@ struct ad7192_state { struct ad_sigma_delta sd; }; +struct ad7192_chip_info { + unsigned int chip_id; + const char *name; + struct iio_chan_spec *channels; + u8 num_channels; + const struct iio_info *info; + int (*parse_channels)(struct iio_dev *indio_dev); +}; + static const char * const ad7192_syscalib_modes[] = { [AD7192_SYSCALIB_ZERO_SCALE] = "zero_scale", [AD7192_SYSCALIB_FULL_SCALE] = "full_scale", @@ -925,6 +938,15 @@ static const struct iio_info ad7192_info = { .update_scan_mode = ad7192_update_scan_mode, }; +static const struct iio_info ad7194_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, + .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, @@ -1016,6 +1038,90 @@ static struct iio_chan_spec ad7193_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(14), }; +static int ad7192_parse_channel(struct fwnode_handle *child, + struct iio_chan_spec *ad7194_channels) +{ + u32 ain[2]; + int ret; + + ret = fwnode_property_read_u32_array(child, "diff-channels", ain, + ARRAY_SIZE(ain)); + if (ret) + return ret; + + if (!in_range(ain[0], AD7194_CH_AIN_START, AD7194_CH_AIN_NR) || + !in_range(ain[1], AD7194_CH_AIN_START, AD7194_CH_AIN_NR)) + return -EINVAL; + + ad7194_channels->channel = ain[0]; + ad7194_channels->channel2 = ain[1]; + ad7194_channels->address = AD7194_CH_DIFF(ain[0], ain[1]); + + return 0; +} + +static int ad7192_parse_channels(struct iio_dev *indio_dev) +{ + struct ad7192_state *st = iio_priv(indio_dev); + struct device *dev = indio_dev->dev.parent; + struct iio_chan_spec *ad7194_channels; + struct fwnode_handle *child; + struct iio_chan_spec ad7194_chan = AD7193_CHANNEL(0, 0, 0); + struct iio_chan_spec ad7194_chan_diff = AD7193_DIFF_CHANNEL(0, 0, 0, 0); + struct iio_chan_spec ad7194_chan_temp = AD719x_TEMP_CHANNEL(0, 0); + struct iio_chan_spec ad7194_chan_timestamp = IIO_CHAN_SOFT_TIMESTAMP(0); + unsigned int num_channels, index = 0, ain_chan; + int ret; + + num_channels = device_get_child_node_count(dev); + if (num_channels > AD7194_CH_DIFF_NR_MAX) + return -EINVAL; + + num_channels += AD7194_CH_BASE_NR; + + ad7194_channels = devm_kcalloc(dev, sizeof(*ad7194_channels), + num_channels, GFP_KERNEL); + if (!ad7194_channels) + return -ENOMEM; + + indio_dev->channels = ad7194_channels; + indio_dev->num_channels = num_channels; + + device_for_each_child_node(dev, child) { + *ad7194_channels = ad7194_chan_diff; + ad7194_channels->scan_index = index++; + ret = ad7192_parse_channel(child, ad7194_channels); + if (ret) { + fwnode_handle_put(child); + return ret; + } + ad7194_channels++; + } + + *ad7194_channels = ad7194_chan_temp; + ad7194_channels->scan_index = index++; + ad7194_channels->address = AD7194_CH_TEMP; + ad7194_channels++; + + for (ain_chan = 1; ain_chan <= 16; ain_chan++) { + if (st->aincom_mv) { + *ad7194_channels = ad7194_chan; + } else { + *ad7194_channels = ad7194_chan_diff; + ad7194_channels->channel2 = 0; + } + ad7194_channels->scan_index = index++; + ad7194_channels->channel = ain_chan; + ad7194_channels->address = AD7194_CH_DIFF(ain_chan, 0); + ad7194_channels++; + } + + *ad7194_channels = ad7194_chan_timestamp; + ad7194_channels->scan_index = index; + + return 0; +} + static const struct ad7192_chip_info ad7192_chip_info_tbl[] = { [ID_AD7190] = { .chip_id = CHIPID_AD7190, @@ -1038,6 +1144,12 @@ static const struct ad7192_chip_info ad7192_chip_info_tbl[] = { .num_channels = ARRAY_SIZE(ad7193_channels), .info = &ad7192_info, }, + [ID_AD7194] = { + .chip_id = CHIPID_AD7194, + .name = "ad7194", + .info = &ad7194_info, + .parse_channels = ad7192_parse_channels, + }, [ID_AD7195] = { .chip_id = CHIPID_AD7195, .name = "ad7195", @@ -1164,6 +1276,12 @@ static int ad7192_probe(struct spi_device *spi) indio_dev->num_channels = st->chip_info->num_channels; indio_dev->info = st->chip_info->info; + if (st->chip_info->parse_channels) { + ret = st->chip_info->parse_channels(indio_dev); + if (ret) + return ret; + } + ret = ad_sd_init(&st->sd, indio_dev, spi, &ad7192_sigma_delta_info); if (ret) return ret; @@ -1201,6 +1319,7 @@ static const struct of_device_id ad7192_of_match[] = { { .compatible = "adi,ad7190", .data = &ad7192_chip_info_tbl[ID_AD7190] }, { .compatible = "adi,ad7192", .data = &ad7192_chip_info_tbl[ID_AD7192] }, { .compatible = "adi,ad7193", .data = &ad7192_chip_info_tbl[ID_AD7193] }, + { .compatible = "adi,ad7194", .data = &ad7192_chip_info_tbl[ID_AD7194] }, { .compatible = "adi,ad7195", .data = &ad7192_chip_info_tbl[ID_AD7195] }, {} }; @@ -1210,6 +1329,7 @@ static const struct spi_device_id ad7192_ids[] = { { "ad7190", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7190] }, { "ad7192", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7192] }, { "ad7193", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7193] }, + { "ad7194", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7194] }, { "ad7195", (kernel_ulong_t)&ad7192_chip_info_tbl[ID_AD7195] }, {} }; @@ -1226,6 +1346,6 @@ static struct spi_driver ad7192_driver = { module_spi_driver(ad7192_driver); MODULE_AUTHOR("Michael Hennerich "); -MODULE_DESCRIPTION("Analog Devices AD7190, AD7192, AD7193, AD7195 ADC"); +MODULE_DESCRIPTION("Analog Devices AD7192 and similar ADC"); MODULE_LICENSE("GPL v2"); MODULE_IMPORT_NS(IIO_AD_SIGMA_DELTA);