From nobody Thu Sep 19 16:06:48 2024 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 565A41A6187 for ; Wed, 31 Jul 2024 07:05:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722409560; cv=none; b=XFokxR84KxBzmmsxQ4gxGrBSjAomh/Boh1PVHY+jQcCHsoKs1kJYXKH0faUAnq6RBEFMH7PFU/nMdE6XplpwpDUbwapbhiKbmtMwg91Wat3M7s/K+0TtbPyAP3zem/W7AqM0uuHURSqTOGgSmtn+7FxAl8ncyc/ScU1LVNt8vaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722409560; c=relaxed/simple; bh=N+VAsoVMf0kYaOmZRtqmOTy82UerzihLlHhBrWb2ieY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oFpUyLEq3NgAA5kJZwGL8Xf++WFDnh1QKibJ8wJ4dQmIj10WxeTnPSOuQC8dR6quALEapGnkWAcoEaXYhV2G9TX5+B7AUcsstrmZyfmb1LNw61RLngAv5mpSDux+rRZeSYAob5m+0NCcWuUTjALLBwNQRheQ+//mJU22h8jSDPI= 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=ON43Mv3f; arc=none smtp.client-ip=209.85.128.42 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="ON43Mv3f" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-427b1d4da32so3240555e9.0 for ; Wed, 31 Jul 2024 00:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1722409555; x=1723014355; 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=b3bgQ57CHVc0q9CRE3lnl6yM7nPtiuF3hPunbjRQ+tE=; b=ON43Mv3fL0GsOgYV4nI8MiB8r1g8KgNvd/Rn3Ew3q70xFLVPkqduK9BK59BfrRUOy/ T96PQEn7yXOTopOCdaVNLO4GtkFG5xQmwIlnM/3gXcmyldiGEbhsGDCza8lFibdReUFS XgLU3QbAwY95TsPB4ZMUULgN57Zs9gC16vav2YjHtiuk9KQQrdmWo0NDKBWCqjN73/7J Pz2yeVVAh7An1CT2JzHqizqVMt1+vZk3SljGNM9mA+9ZFFl3g29zHuET+3WMLOvGoveI 0zqRJe0q4qVGllbpJiBVozD2QFHXXQs7IT+ZdgIRONa9I3kk9p0d+Qzoq3iFeKY6U6Y0 ZMfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722409555; x=1723014355; 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=b3bgQ57CHVc0q9CRE3lnl6yM7nPtiuF3hPunbjRQ+tE=; b=ex47r8Hwa537SS2hx99z6x9dqjaGqKAYalRVHN0toTRKHvVNe1jcy6CtZAgGSz6IEO 6zH6esjFdo8pFAZ7cVYIAQjWygJMHFEqKPmtP9oDRAdPJfIfKuxilO42WByTn8udo98j p6V/vl7/iaPhJaDmkjOCNn5ZEM7I0dHF2RhQxlHC2Yocfx9eNe1HB186/8HyDkIx9UoS R+EkpeoN5VTd1NeJhE/YDOAR7ZsSkvnkd4U2Qf6Ac8VGWimVx8KtjzMFzOOZkyPCZQ4I walU/x/VRqkvaJe6eyhIGFHQcbdiUNxTLlMrrwPc37/OlEuR7ADRmv8iFnfUZrXVoNOH PQwQ== X-Forwarded-Encrypted: i=1; AJvYcCUprdxB0QvOghe6isST3bElnIgsq3o+J4xW1eLuO6thJ9c9pJYxVnMJwU4zgMOnhDhlix3F+drOK2dNndgaZ8kc/aHFyAfx4GyneBw7 X-Gm-Message-State: AOJu0Yz6EHSFL6KAZEdoRD6dfktW53Aiw5WA9baJdctawzxDcfeZZTbd n96xXuq4rp5wcMyy/KL5gEP+CJj0csxds/utuL/W5hiRl6Cn5p3VUM14x3YTl18= X-Google-Smtp-Source: AGHT+IHaNgJ9qJUDwpfCS2bmF3oSur6kZVjB8NRZNOTRFu6mqp0yrMIwSz+MHZqNTQXGtQuHInyg3Q== X-Received: by 2002:a05:6000:d01:b0:362:4679:b5a with SMTP id ffacd0b85a97d-36b8c8e99ebmr2991645f8f.16.1722409554646; Wed, 31 Jul 2024 00:05:54 -0700 (PDT) Received: from [192.168.1.61] (2a02-842a-d52e-6101-6f8f-5617-c4b6-8627.rev.sfr.net. [2a02:842a:d52e:6101:6f8f:5617:c4b6:8627]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4282b8a2593sm9953215e9.4.2024.07.31.00.05.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 00:05:54 -0700 (PDT) From: Julien Stephan Date: Wed, 31 Jul 2024 09:05:46 +0200 Subject: [PATCH v2 5/7] iio: adc: ad7380: add support for single-ended parts Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240731-ad7380-add-single-ended-chips-v2-5-cd63bf05744c@baylibre.com> References: <20240731-ad7380-add-single-ended-chips-v2-0-cd63bf05744c@baylibre.com> In-Reply-To: <20240731-ad7380-add-single-ended-chips-v2-0-cd63bf05744c@baylibre.com> To: Michael Hennerich , =?utf-8?q?Nuno_S=C3=A1?= , David Lechner , Lars-Peter Clausen , Jonathan Cameron , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jonathan Corbet Cc: Michael Hennerich , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Julien Stephan X-Mailer: b4 0.13.0 Adding ad7386/7/8 (16/14/12 bits) unsigned, dual simultaneous sampling, single-ended compatible parts, and the corresponding ad7386-4/7-4/8-4 4 channels. These parts have a 2:1 multiplexer in front of each ADC. They also include additional configuration registers that allow for either manual selection or automatic switching (sequencer mode), of the multiplexer inputs. This commit focus on integrating manual selection. Sequencer mode will be implemented later. From an IIO point of view, all inputs are exported, i.e ad7386/7/8 export 4 channels and ad7386-4/7-4/8-4 export 8 channels. Inputs AinX0 of multiplexers correspond to the first half of IIO channels (i.e 0-1 or 0-3) and inputs AinX1 correspond to second half (i.e 2-3 or 4-7). Example for AD7386/7/8 (2 channels parts): IIO | AD7386/7/8 | +---------------------------- | | _____ ______ | | | | | | voltage0 | AinA0 --|--->| | | | | | | mux |----->| ADCA |--- voltage2 | AinA1 --|--->| | | | | | |_____| |_____ | | | _____ ______ | | | | | | voltage1 | AinB0 --|--->| | | | | | | mux |----->| ADCB |--- voltage3 | AinB1 --|--->| | | | | | |_____| |______| | | | +---------------------------- When switching channel, the ADC require an additional settling time. According to the datasheet, data is valid on the third CS low. We already have an extra toggle before each read (either direct reads or buffered reads) to sample correct data, so we just add a single CS toggle at the end of the register write. Signed-off-by: Julien Stephan --- drivers/iio/adc/ad7380.c | 351 +++++++++++++++++++++++++++++++++++++++++--= ---- 1 file changed, 309 insertions(+), 42 deletions(-) diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c index 04cc1ef18131..820df04b9eb2 100644 --- a/drivers/iio/adc/ad7380.c +++ b/drivers/iio/adc/ad7380.c @@ -8,9 +8,11 @@ * Datasheets of supported parts: * ad7380/1 : https://www.analog.com/media/en/technical-documentation/data= -sheets/AD7380-7381.pdf * ad7383/4 : https://www.analog.com/media/en/technical-documentation/data= -sheets/ad7383-7384.pdf + * ad7386/7/8 : https://www.analog.com/media/en/technical-documentation/da= ta-sheets/AD7386-7387-7388.pdf * ad7380-4 : https://www.analog.com/media/en/technical-documentation/data= -sheets/ad7380-4.pdf * ad7381-4 : https://www.analog.com/media/en/technical-documentation/data= -sheets/ad7381-4.pdf * ad7383/4-4 : https://www.analog.com/media/en/technical-documentation/da= ta-sheets/ad7383-4-ad7384-4.pdf + * ad7386/7/8-4 : https://www.analog.com/media/en/technical-documentation/= data-sheets/ad7386-4-7387-4-7388-4.pdf */ =20 #include @@ -49,6 +51,7 @@ #define AD7380_REG_ADDR_ALERT_LOW_TH 0x4 #define AD7380_REG_ADDR_ALERT_HIGH_TH 0x5 =20 +#define AD7380_CONFIG1_CH BIT(11) #define AD7380_CONFIG1_OS_MODE BIT(9) #define AD7380_CONFIG1_OSR GENMASK(8, 6) #define AD7380_CONFIG1_CRC_W BIT(5) @@ -81,6 +84,7 @@ struct ad7380_chip_info { const struct iio_chan_spec *channels; unsigned int num_channels; unsigned int num_simult_channels; + bool has_mux; const char * const *vcm_supplies; unsigned int num_vcm_supplies; const unsigned long *available_scan_masks; @@ -92,8 +96,24 @@ enum { AD7380_SCAN_TYPE_RESOLUTION_BOOST, }; =20 -/* Extended scan types for 14-bit chips. */ -static const struct iio_scan_type ad7380_scan_type_14[] =3D { +/* Extended scan types for 12-bit unsigned chips. */ +static const struct iio_scan_type ad7380_scan_type_12_u[] =3D { + [AD7380_SCAN_TYPE_NORMAL] =3D { + .sign =3D 'u', + .realbits =3D 12, + .storagebits =3D 16, + .endianness =3D IIO_CPU, + }, + [AD7380_SCAN_TYPE_RESOLUTION_BOOST] =3D { + .sign =3D 'u', + .realbits =3D 14, + .storagebits =3D 16, + .endianness =3D IIO_CPU, + }, +}; + +/* Extended scan types for 14-bit signed chips. */ +static const struct iio_scan_type ad7380_scan_type_14_s[] =3D { [AD7380_SCAN_TYPE_NORMAL] =3D { .sign =3D 's', .realbits =3D 14, @@ -108,8 +128,24 @@ static const struct iio_scan_type ad7380_scan_type_14[= ] =3D { }, }; =20 -/* Extended scan types for 16-bit chips. */ -static const struct iio_scan_type ad7380_scan_type_16[] =3D { +/* Extended scan types for 14-bit unsigned chips. */ +static const struct iio_scan_type ad7380_scan_type_14_u[] =3D { + [AD7380_SCAN_TYPE_NORMAL] =3D { + .sign =3D 'u', + .realbits =3D 14, + .storagebits =3D 16, + .endianness =3D IIO_CPU, + }, + [AD7380_SCAN_TYPE_RESOLUTION_BOOST] =3D { + .sign =3D 'u', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_CPU, + }, +}; + +/* Extended scan types for 16-bit signed_chips. */ +static const struct iio_scan_type ad7380_scan_type_16_s[] =3D { [AD7380_SCAN_TYPE_NORMAL] =3D { .sign =3D 's', .realbits =3D 16, @@ -124,50 +160,87 @@ static const struct iio_scan_type ad7380_scan_type_16= [] =3D { }, }; =20 -#define AD7380_CHANNEL(index, bits, diff) { \ - .type =3D IIO_VOLTAGE, \ - .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | \ - ((diff) ? 0 : BIT(IIO_CHAN_INFO_OFFSET)), \ - .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SCALE) | \ - BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ - .info_mask_shared_by_type_available =3D \ - BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ - .indexed =3D 1, \ - .differential =3D (diff), \ - .channel =3D (diff) ? (2 * (index)) : (index), \ - .channel2 =3D (diff) ? (2 * (index) + 1) : 0, \ - .scan_index =3D (index), \ - .has_ext_scan_type =3D 1, \ - .ext_scan_type =3D ad7380_scan_type_##bits, \ - .num_ext_scan_type =3D ARRAY_SIZE(ad7380_scan_type_##bits),\ +/* Extended scan types for 16-bit unsigned chips. */ +static const struct iio_scan_type ad7380_scan_type_16_u[] =3D { + [AD7380_SCAN_TYPE_NORMAL] =3D { + .sign =3D 'u', + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_CPU, + }, + [AD7380_SCAN_TYPE_RESOLUTION_BOOST] =3D { + .sign =3D 'u', + .realbits =3D 18, + .storagebits =3D 32, + .endianness =3D IIO_CPU, + }, +}; + +#define AD7380_CHANNEL(index, bits, diff, sign) { \ + .type =3D IIO_VOLTAGE, \ + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | \ + ((diff) ? 0 : BIT(IIO_CHAN_INFO_OFFSET)), \ + .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ + .info_mask_shared_by_type_available =3D \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ + .indexed =3D 1, \ + .differential =3D (diff), \ + .channel =3D (diff) ? (2 * (index)) : (index), \ + .channel2 =3D (diff) ? (2 * (index) + 1) : 0, \ + .scan_index =3D (index), \ + .has_ext_scan_type =3D 1, \ + .ext_scan_type =3D ad7380_scan_type_##bits##_##sign, \ + .num_ext_scan_type =3D ARRAY_SIZE(ad7380_scan_type_##bits##_##sign), \ } =20 -#define DEFINE_AD7380_2_CHANNEL(name, bits, diff) \ +#define DEFINE_AD7380_2_CHANNEL(name, bits, diff, sign) \ static const struct iio_chan_spec name[] =3D { \ - AD7380_CHANNEL(0, bits, diff), \ - AD7380_CHANNEL(1, bits, diff), \ + AD7380_CHANNEL(0, bits, diff, sign), \ + AD7380_CHANNEL(1, bits, diff, sign), \ IIO_CHAN_SOFT_TIMESTAMP(2), \ } =20 -#define DEFINE_AD7380_4_CHANNEL(name, bits, diff) \ +#define DEFINE_AD7380_4_CHANNEL(name, bits, diff, sign) \ static const struct iio_chan_spec name[] =3D { \ - AD7380_CHANNEL(0, bits, diff), \ - AD7380_CHANNEL(1, bits, diff), \ - AD7380_CHANNEL(2, bits, diff), \ - AD7380_CHANNEL(3, bits, diff), \ + AD7380_CHANNEL(0, bits, diff, sign), \ + AD7380_CHANNEL(1, bits, diff, sign), \ + AD7380_CHANNEL(2, bits, diff, sign), \ + AD7380_CHANNEL(3, bits, diff, sign), \ IIO_CHAN_SOFT_TIMESTAMP(4), \ } =20 +#define DEFINE_AD7380_8_CHANNEL(name, bits, diff, sign) \ +static const struct iio_chan_spec name[] =3D { \ + AD7380_CHANNEL(0, bits, diff, sign), \ + AD7380_CHANNEL(1, bits, diff, sign), \ + AD7380_CHANNEL(2, bits, diff, sign), \ + AD7380_CHANNEL(3, bits, diff, sign), \ + AD7380_CHANNEL(4, bits, diff, sign), \ + AD7380_CHANNEL(5, bits, diff, sign), \ + AD7380_CHANNEL(6, bits, diff, sign), \ + AD7380_CHANNEL(7, bits, diff, sign), \ + IIO_CHAN_SOFT_TIMESTAMP(8), \ +} + /* fully differential */ -DEFINE_AD7380_2_CHANNEL(ad7380_channels, 16, 1); -DEFINE_AD7380_2_CHANNEL(ad7381_channels, 14, 1); -DEFINE_AD7380_4_CHANNEL(ad7380_4_channels, 16, 1); -DEFINE_AD7380_4_CHANNEL(ad7381_4_channels, 14, 1); +DEFINE_AD7380_2_CHANNEL(ad7380_channels, 16, 1, s); +DEFINE_AD7380_2_CHANNEL(ad7381_channels, 14, 1, s); +DEFINE_AD7380_4_CHANNEL(ad7380_4_channels, 16, 1, s); +DEFINE_AD7380_4_CHANNEL(ad7381_4_channels, 14, 1, s); /* pseudo differential */ -DEFINE_AD7380_2_CHANNEL(ad7383_channels, 16, 0); -DEFINE_AD7380_2_CHANNEL(ad7384_channels, 14, 0); -DEFINE_AD7380_4_CHANNEL(ad7383_4_channels, 16, 0); -DEFINE_AD7380_4_CHANNEL(ad7384_4_channels, 14, 0); +DEFINE_AD7380_2_CHANNEL(ad7383_channels, 16, 0, s); +DEFINE_AD7380_2_CHANNEL(ad7384_channels, 14, 0, s); +DEFINE_AD7380_4_CHANNEL(ad7383_4_channels, 16, 0, s); +DEFINE_AD7380_4_CHANNEL(ad7384_4_channels, 14, 0, s); + +/* Single ended */ +DEFINE_AD7380_4_CHANNEL(ad7386_channels, 16, 0, u); +DEFINE_AD7380_4_CHANNEL(ad7387_channels, 14, 0, u); +DEFINE_AD7380_4_CHANNEL(ad7388_channels, 12, 0, u); +DEFINE_AD7380_8_CHANNEL(ad7386_4_channels, 16, 0, u); +DEFINE_AD7380_8_CHANNEL(ad7387_4_channels, 14, 0, u); +DEFINE_AD7380_8_CHANNEL(ad7388_4_channels, 12, 0, u); =20 static const char * const ad7380_2_channel_vcm_supplies[] =3D { "aina", "ainb", @@ -188,6 +261,48 @@ static const unsigned long ad7380_4_channel_scan_masks= [] =3D { 0 }; =20 +/* + * Single ended parts have a 2:1 multiplexer in front of each ADC. + * + * From an IIO point of view, all inputs are exported, i.e ad7386/7/8 + * export 4 channels and ad7386-4/7-4/8-4 export 8 channels. + * + * Inputs AinX0 of multiplexers correspond to the first half of IIO channe= ls + * (i.e 0-1 or 0-3) and inputs AinX1 correspond to second half (i.e 2-3 or + * 4-7). Example for AD7386/7/8 (2 channels parts): + * + * IIO | AD7386/7/8 + * | +---------------------------- + * | | _____ ______ + * | | | | | | + * voltage0 | AinA0 --|--->| | | | + * | | | mux |----->| ADCA |--- + * voltage2 | AinA1 --|--->| | | | + * | | |_____| |_____ | + * | | _____ ______ + * | | | | | | + * voltage1 | AinB0 --|--->| | | | + * | | | mux |----->| ADCB |--- + * voltage3 | AinB1 --|--->| | | | + * | | |_____| |______| + * | | + * | +---------------------------- + * + * Since this is simultaneous sampling for AinX0 OR AinX1 we have two sepa= rate + * scan masks. + */ +static const unsigned long ad7380_2x2_channel_scan_masks[] =3D { + GENMASK(1, 0), + GENMASK(3, 2), + 0 +}; + +static const unsigned long ad7380_2x4_channel_scan_masks[] =3D { + GENMASK(3, 0), + GENMASK(7, 4), + 0 +}; + static const struct ad7380_timing_specs ad7380_timing =3D { .t_csh_ns =3D 10, }; @@ -245,6 +360,36 @@ static const struct ad7380_chip_info ad7384_chip_info = =3D { .timing_specs =3D &ad7380_timing, }; =20 +static const struct ad7380_chip_info ad7386_chip_info =3D { + .name =3D "ad7386", + .channels =3D ad7386_channels, + .num_channels =3D ARRAY_SIZE(ad7386_channels), + .num_simult_channels =3D 2, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x2_channel_scan_masks, + .timing_specs =3D &ad7380_timing, +}; + +static const struct ad7380_chip_info ad7387_chip_info =3D { + .name =3D "ad7387", + .channels =3D ad7387_channels, + .num_channels =3D ARRAY_SIZE(ad7387_channels), + .num_simult_channels =3D 2, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x2_channel_scan_masks, + .timing_specs =3D &ad7380_timing, +}; + +static const struct ad7380_chip_info ad7388_chip_info =3D { + .name =3D "ad7388", + .channels =3D ad7388_channels, + .num_channels =3D ARRAY_SIZE(ad7388_channels), + .num_simult_channels =3D 2, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x2_channel_scan_masks, + .timing_specs =3D &ad7380_timing, +}; + static const struct ad7380_chip_info ad7380_4_chip_info =3D { .name =3D "ad7380-4", .channels =3D ad7380_4_channels, @@ -285,12 +430,43 @@ static const struct ad7380_chip_info ad7384_4_chip_in= fo =3D { .timing_specs =3D &ad7380_4_timing, }; =20 +static const struct ad7380_chip_info ad7386_4_chip_info =3D { + .name =3D "ad7386-4", + .channels =3D ad7386_4_channels, + .num_channels =3D ARRAY_SIZE(ad7386_4_channels), + .num_simult_channels =3D 4, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x4_channel_scan_masks, + .timing_specs =3D &ad7380_4_timing, +}; + +static const struct ad7380_chip_info ad7387_4_chip_info =3D { + .name =3D "ad7387-4", + .channels =3D ad7387_4_channels, + .num_channels =3D ARRAY_SIZE(ad7387_4_channels), + .num_simult_channels =3D 4, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x4_channel_scan_masks, + .timing_specs =3D &ad7380_4_timing, +}; + +static const struct ad7380_chip_info ad7388_4_chip_info =3D { + .name =3D "ad7388-4", + .channels =3D ad7388_4_channels, + .num_channels =3D ARRAY_SIZE(ad7388_4_channels), + .num_simult_channels =3D 4, + .has_mux =3D true, + .available_scan_masks =3D ad7380_2x4_channel_scan_masks, + .timing_specs =3D &ad7380_4_timing, +}; + struct ad7380_state { const struct ad7380_chip_info *chip_info; struct spi_device *spi; struct regmap *regmap; unsigned int oversampling_ratio; bool resolution_boost_enabled; + unsigned int ch; unsigned int vref_mv; unsigned int vcm_mv[MAX_NUM_CHANNELS]; /* xfers, message an buffer for reading sample data */ @@ -388,6 +564,43 @@ static int ad7380_debugfs_reg_access(struct iio_dev *i= ndio_dev, u32 reg, unreachable(); } =20 +/* + * When switching channel, the ADC require an additional settling time. + * According to the datasheet, data is value on the third CS low. We alrea= dy + * have an extra toggle before each read (either direct reads or buffered = reads) + * to sample correct data, so we just add a single CS toggle at the end of= the + * register write. + */ +static int ad7380_set_ch(struct ad7380_state *st, unsigned int ch) +{ + struct spi_transfer xfer =3D { + .delay =3D { + .value =3D T_CONVERT_NS, + .unit =3D SPI_DELAY_UNIT_NSECS, + } + }; + int ret; + + if (st->ch =3D=3D ch) + return 0; + + ret =3D regmap_update_bits(st->regmap, + AD7380_REG_ADDR_CONFIG1, + AD7380_CONFIG1_CH, + FIELD_PREP(AD7380_CONFIG1_CH, ch)); + + if (ret) + return ret; + + st->ch =3D ch; + + if (st->oversampling_ratio > 1) + xfer.delay.value =3D T_CONVERT_0_NS + + T_CONVERT_X_NS * (st->oversampling_ratio - 1); + + return spi_sync_transfer(st->spi, &xfer, 1); +} + /** * ad7380_update_xfers - update the SPI transfers base on the current scan= type * @st: device instance specific state @@ -432,6 +645,24 @@ static int ad7380_triggered_buffer_preenable(struct ii= o_dev *indio_dev) if (IS_ERR(scan_type)) return PTR_ERR(scan_type); =20 + if (st->chip_info->has_mux) { + unsigned int index; + int ret; + + /* + * Depending on the requested scan_mask and current state, + * we need to change CH bit to sample correct data. + */ + ret =3D iio_active_scan_mask_index(indio_dev); + if (ret < 0) + return ret; + + index =3D ret; + ret =3D ad7380_set_ch(st, index); + if (ret) + return ret; + } + ad7380_update_xfers(st, scan_type); =20 return spi_optimize_message(st->spi, &st->msg); @@ -474,20 +705,43 @@ static irqreturn_t ad7380_trigger_handler(int irq, vo= id *p) static int ad7380_read_direct(struct ad7380_state *st, unsigned int scan_i= ndex, const struct iio_scan_type *scan_type, int *val) { + unsigned int index =3D scan_index; int ret; =20 + if (st->chip_info->has_mux) { + unsigned int ch =3D 0; + + if (index >=3D st->chip_info->num_simult_channels) { + index -=3D st->chip_info->num_simult_channels; + ch =3D 1; + } + + ret =3D ad7380_set_ch(st, ch); + if (ret) + return ret; + } + ad7380_update_xfers(st, scan_type); =20 ret =3D spi_sync(st->spi, &st->msg); if (ret < 0) return ret; =20 - if (scan_type->storagebits > 16) - *val =3D sign_extend32(*(u32 *)(st->scan_data + 4 * scan_index), - scan_type->realbits - 1); - else - *val =3D sign_extend32(*(u16 *)(st->scan_data + 2 * scan_index), - scan_type->realbits - 1); + if (scan_type->storagebits > 16) { + if (scan_type->sign =3D=3D 's') + *val =3D sign_extend32(*(u32 *)(st->scan_data + 4 * index), + scan_type->realbits - 1); + else + *val =3D *(u32 *)(st->scan_data + 4 * index) & + GENMASK(scan_type->realbits - 1, 0); + } else { + if (scan_type->sign =3D=3D 's') + *val =3D sign_extend32(*(u16 *)(st->scan_data + 2 * index), + scan_type->realbits - 1); + else + *val =3D *(u16 *)(st->scan_data + 2 * index) & + GENMASK(scan_type->realbits - 1, 0); + } =20 return IIO_VAL_INT; } @@ -664,6 +918,7 @@ static int ad7380_init(struct ad7380_state *st, struct = regulator *vref) =20 /* This is the default value after reset. */ st->oversampling_ratio =3D 1; + st->ch =3D 0; =20 /* SPI 1-wire mode */ return regmap_update_bits(st->regmap, AD7380_REG_ADDR_CONFIG2, @@ -807,10 +1062,16 @@ static const struct of_device_id ad7380_of_match_tab= le[] =3D { { .compatible =3D "adi,ad7381", .data =3D &ad7381_chip_info }, { .compatible =3D "adi,ad7383", .data =3D &ad7383_chip_info }, { .compatible =3D "adi,ad7384", .data =3D &ad7384_chip_info }, + { .compatible =3D "adi,ad7386", .data =3D &ad7386_chip_info }, + { .compatible =3D "adi,ad7387", .data =3D &ad7387_chip_info }, + { .compatible =3D "adi,ad7388", .data =3D &ad7388_chip_info }, { .compatible =3D "adi,ad7380-4", .data =3D &ad7380_4_chip_info }, { .compatible =3D "adi,ad7381-4", .data =3D &ad7381_4_chip_info }, { .compatible =3D "adi,ad7383-4", .data =3D &ad7383_4_chip_info }, { .compatible =3D "adi,ad7384-4", .data =3D &ad7384_4_chip_info }, + { .compatible =3D "adi,ad7386-4", .data =3D &ad7386_4_chip_info }, + { .compatible =3D "adi,ad7387-4", .data =3D &ad7387_4_chip_info }, + { .compatible =3D "adi,ad7388-4", .data =3D &ad7388_4_chip_info }, { } }; =20 @@ -819,10 +1080,16 @@ static const struct spi_device_id ad7380_id_table[] = =3D { { "ad7381", (kernel_ulong_t)&ad7381_chip_info }, { "ad7383", (kernel_ulong_t)&ad7383_chip_info }, { "ad7384", (kernel_ulong_t)&ad7384_chip_info }, + { "ad7386", (kernel_ulong_t)&ad7386_chip_info }, + { "ad7387", (kernel_ulong_t)&ad7387_chip_info }, + { "ad7388", (kernel_ulong_t)&ad7388_chip_info }, { "ad7380-4", (kernel_ulong_t)&ad7380_4_chip_info }, { "ad7381-4", (kernel_ulong_t)&ad7381_4_chip_info }, { "ad7383-4", (kernel_ulong_t)&ad7383_4_chip_info }, { "ad7384-4", (kernel_ulong_t)&ad7384_4_chip_info }, + { "ad7386-4", (kernel_ulong_t)&ad7386_4_chip_info }, + { "ad7387-4", (kernel_ulong_t)&ad7387_4_chip_info }, + { "ad7388-4", (kernel_ulong_t)&ad7388_4_chip_info }, { } }; MODULE_DEVICE_TABLE(spi, ad7380_id_table); --=20 2.45.1