From patchwork Fri Oct 4 21:48:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Stols X-Patchwork-Id: 832826 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 1E79D1D9581 for ; Fri, 4 Oct 2024 21:48:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728078543; cv=none; b=jvN9UIxIlPGerBNZ5oWzIKgtnYGpUqTjVhmY24XxTFi3lo69Fnjc2aJdMLGSL3v8QrZ0Cr3CcHfHrI0Ak73P+cvRTnsNzBzHnnvWA6xvm9Ob6OlV8D/TFryuQ1Q4+CGbm1TVvAIc7O2uiYER01ESvGFD8OM4wYK52PuQiJnVaKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728078543; c=relaxed/simple; bh=xHVL9hFRnsVwqhbglw04wIIXIdpeMmNkgRFma7ACntE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m6dWs/oy/cQ+3ytw3/SR5bjBni4jlaaEv+vS+QC+weLpNdHFWkR+6SnJN5Fi3ukgYUNtFhatBDt7yFvLQ8dX4djByryp/BbajrXiSnQzrLDH/Ac3Z5t36hpplNHy+62QGRZK+LWnwFXgO77p3QKKcwxMpiEoO5gNcGQlP3OAV0s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=1/KfVxdJ; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="1/KfVxdJ" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-42cafda818aso25253585e9.2 for ; Fri, 04 Oct 2024 14:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1728078537; x=1728683337; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=8pV8pjeJyvz9NA6GV4WH7O2OYuFeF2Ofuw4iAW9WvmE=; b=1/KfVxdJ3jVHUlBfppMqF8SxWhiWOiAZT+PNtBrije4Oy2tUr4TMiZlx+lboUjg9zH wxJwJDJfBqOvMg2H2ux0w8EAuc5VGtHmCMu59d79WQB71CwJAh0HlSt6T2ODk4JTYMxV e35XjnkLIAEoYIW3lCq3p3Ir75h3gB/yquoUHDZqczQHlDwjd9w/JKLbN1AEQC7eHj8C a8RImoMRGIW+glmDhao4T0LXDqnoH9jLNg25iXpALr6sRW/kdz29V7D0jQmE5/dubDcT dbyEv2WXBFnhsdHyKz7EJQL4VKHHCeWYexwzZR7b/JnPtBfXjVISAjrSVMDVtmUQ5fqH wsyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728078537; x=1728683337; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8pV8pjeJyvz9NA6GV4WH7O2OYuFeF2Ofuw4iAW9WvmE=; b=sCJWl0xhZuXOEwz7Y2Y794M98tQXQ4+UQCsXIuQ9mQDHrh13Eiz5zri6xc2XavD7uL v7I5bQ6taKKo87Bof3HKMufdVdoomouhE4m3oJe2W1j6bPNfLH7elXmOFduInBz0qRtx nyrFvzEc1f2GQh9D7d/7xFNXUmb4Up5FzoMCZsrJFynijg9Jhyoiz5XKERy6vW7m5BL6 KSIM3BZV36RarAMC4e0dRT1BgHbkCYdGzOgB5/uKZrUcEj3BLnsIRt/eOY+oJsmX5gEJ MG7KuThM3z4U16S3aeLisMpe747n0CKWXO1rjBzSs9fxYtakXn618GAZvwYE/a2DwUZx 52/Q== X-Forwarded-Encrypted: i=1; AJvYcCVYSMDyCa3vPGhIiGSl+xu65Ge9n5E+BwG9Zn9IUGRTUffVBJYICz6YOcLy4XmRD+yNuisJT19OkGPtvw==@vger.kernel.org X-Gm-Message-State: AOJu0Yy3cUuUTKa/PMBOIV7/oKtNOHf3zU6ux8ZjkWw/IwiMPKXX292o Ayqpv/den7u+phI9QpcvXABqEUjTqYP3EJtixeT8R8s3shrzKCuZ+YAlmNOGs8g= X-Google-Smtp-Source: AGHT+IEuT5WXwIfQvFrNf8W7Eyb8KSoPFUu30QIc4rYFsFcc2F865b9R98ARtOzbGbmc6+QJtwwXJQ== X-Received: by 2002:a05:600c:1e04:b0:42c:df54:18ec with SMTP id 5b1f17b1804b1-42f85ae90a5mr30952315e9.28.1728078537149; Fri, 04 Oct 2024 14:48:57 -0700 (PDT) Received: from [127.0.1.1] (frhb82016ds.ikexpress.com. [185.246.87.17]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f86b4ab63sm24680375e9.40.2024.10.04.14.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2024 14:48:56 -0700 (PDT) From: Guillaume Stols Date: Fri, 04 Oct 2024 21:48:42 +0000 Subject: [PATCH v3 08/10] iio: adc: ad7606: Introduce num_adc_channels Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241004-ad7606_add_iio_backend_support-v3-8-38757012ce82@baylibre.com> References: <20241004-ad7606_add_iio_backend_support-v3-0-38757012ce82@baylibre.com> In-Reply-To: <20241004-ad7606_add_iio_backend_support-v3-0-38757012ce82@baylibre.com> To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Greg Kroah-Hartman , "Rafael J. Wysocki" , Jonathan Corbet Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Hennerich , linux-fbdev@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org, aardelean@baylibre.com, dlechner@baylibre.com, Jonathan Cameron , Guillaume Stols X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1728078523; l=4625; i=gstols@baylibre.com; s=20240417; h=from:subject:message-id; bh=xHVL9hFRnsVwqhbglw04wIIXIdpeMmNkgRFma7ACntE=; b=HWtQ4Rbfr4rMrWvXXCRwlOWpd809HtkywgIKDMU2hLnEDQGQSDGgUrgUf1Zu0m2TfBFXeCaEz 4F6rv8pYXYbD9lqyUccTndw0VHq2O+D1qX89k19LL4gZd6MDsejjYeg X-Developer-Key: i=gstols@baylibre.com; a=ed25519; pk=XvMm5WHuV67sGYOJZqIYzXndbaJOlNd8Q6li6vnb4Cs= This variable determines how many hardware channels has the chip, oppositely to the num_channels that can contain more channels, e.g a timestamp channel in our case. Introducing this variable avoids decreasing the former num_channels variable when reading the ADC's channels, and clarifies a bit the code. Signed-off-by: Guillaume Stols --- drivers/iio/adc/ad7606.c | 10 +++++++++- drivers/iio/adc/ad7606.h | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 612e6d9f57ed..3666a58f8a6f 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -150,6 +150,7 @@ static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st, const struct ad7606_chip_info ad7605_4_info = { .channels = ad7605_channels, .name = "ad7605-4", + .num_adc_channels = 4, .num_channels = 5, .scale_setup_cb = ad7606_16bit_chan_scale_setup, }; @@ -158,6 +159,7 @@ EXPORT_SYMBOL_NS_GPL(ad7605_4_info, IIO_AD7606); const struct ad7606_chip_info ad7606_8_info = { .channels = ad7606_channels_16bit, .name = "ad7606-8", + .num_adc_channels = 8, .num_channels = 9, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -168,6 +170,7 @@ EXPORT_SYMBOL_NS_GPL(ad7606_8_info, IIO_AD7606); const struct ad7606_chip_info ad7606_6_info = { .channels = ad7606_channels_16bit, .name = "ad7606-6", + .num_adc_channels = 6, .num_channels = 7, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -178,6 +181,7 @@ EXPORT_SYMBOL_NS_GPL(ad7606_6_info, IIO_AD7606); const struct ad7606_chip_info ad7606_4_info = { .channels = ad7606_channels_16bit, .name = "ad7606-4", + .num_adc_channels = 4, .num_channels = 5, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -188,6 +192,7 @@ EXPORT_SYMBOL_NS_GPL(ad7606_4_info, IIO_AD7606); const struct ad7606_chip_info ad7606b_info = { .channels = ad7606_channels_16bit, .name = "ad7606b", + .num_adc_channels = 8, .num_channels = 9, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -198,6 +203,7 @@ EXPORT_SYMBOL_NS_GPL(ad7606b_info, IIO_AD7606); const struct ad7606_chip_info ad7606c_16_info = { .channels = ad7606_channels_16bit, .name = "ad7606c16", + .num_adc_channels = 8, .num_channels = 9, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -208,6 +214,7 @@ EXPORT_SYMBOL_NS_GPL(ad7606c_16_info, IIO_AD7606); const struct ad7606_chip_info ad7606c_18_info = { .channels = ad7606_channels_18bit, .name = "ad7606c18", + .num_adc_channels = 8, .num_channels = 9, .oversampling_avail = ad7606_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail), @@ -219,6 +226,7 @@ const struct ad7606_chip_info ad7616_info = { .channels = ad7616_channels, .init_delay_ms = 15, .name = "ad7616", + .num_adc_channels = 16, .num_channels = 17, .oversampling_avail = ad7616_oversampling_avail, .oversampling_num = ARRAY_SIZE(ad7616_oversampling_avail), @@ -528,7 +536,7 @@ static int ad7606_set_sampling_freq(struct ad7606_state *st, unsigned long freq) static int ad7606_read_samples(struct ad7606_state *st) { - unsigned int num = st->chip_info->num_channels - 1; + unsigned int num = st->chip_info->num_adc_channels; return st->bops->read_block(st->dev, num, &st->data); } diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index d401d3ab37e0..b26a11b2eba1 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -71,6 +71,7 @@ typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st, * @channels: channel specification * @name device name * @num_channels: number of channels + * @num_adc_channels the number of channels the ADC actually inputs. * @scale_setup_cb: callback to setup the scales for each channel * @oversampling_avail pointer to the array which stores the available * oversampling ratios. @@ -82,6 +83,7 @@ typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st, struct ad7606_chip_info { const struct iio_chan_spec *channels; const char *name; + unsigned int num_adc_channels; unsigned int num_channels; ad7606_scale_setup_cb_t scale_setup_cb; const unsigned int *oversampling_avail;