From nobody Sat Sep 26 15:34:45 2026 Received: from mail-pj2-f8.google.com (mail-pj2-f8.google.com [74.125.227.136]) (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 4974E37C0F6 for ; Mon, 31 Aug 2026 18:47:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.136 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202033; cv=none; b=u7ATvrMnUptvup/4bvq7Z9D6n/3w6KS/CHTTjyoQ27sPalyNDofJ0pHS6f8OonyaPLqPyewoqmP35TDjhU9jmkJLhrEBH9CeeSNue14uTmoi8Vd6Wq/6iG97MMV2T2bJp1kRobToAD03+fg6TUHpvMshF5gz0CgFsTNxwCF7wIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202033; c=relaxed/simple; bh=0YlE6cJLfILSdZce+43bxbJ0SE8HpVovxfqoxR7adec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O77YKZMxXv9fVIqqo1iZaJbQ4vZknvdTqtsCSMKo0IJiiiP0v7BdlzxNYFtX78a3IocV3wcreBrfnth55u9rof6jtwdSLG5U+fHQTPFv6FzwWUhfBUBrmzGHfRPgpoXbVO0nXDLVgkxROoyghkue+8d2N+caFXOUd/wW2PjyQuE= 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=SGvZLHaX; arc=none smtp.client-ip=74.125.227.136 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="SGvZLHaX" Received: by mail-pj2-f8.google.com with SMTP id 98e67ed59e1d1-398b9f722abso708521a91.0 for ; Mon, 31 Aug 2026 11:47:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788202030; x=1788806830; 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:content-type; bh=lWHgwZjI8PJHAdOh0hOZPcNPrnvuZLiyr/mlCNOBOjU=; b=SGvZLHaX5DNZzM522kKdlxEUeQvDIoBHpMF7W5D0oYeZL1mMvHLYpy0sCWoVNrpHo+ blKxBTu0qN2FhQLu30whRxeJsXipOKmsDD+v7vT3bXYa+qj9WmbiJL/Rxi/T3iNjJjU9 21V/SLuL8Dz46uYqSSaj/DO6swSvAx+7IexnLAm9qnP0x+aFm6ZuvRt3TP0xHvbjJN6o bwpF42XzND0dTNdTAb9ZTHPuWOwRNN5jFt9BBex2f/UsyeJktLNa36L/vlqgNxsp8xkt 7vvBupExfvgbBHOXPVZP+PTrlLgp65GVFaki5mgB4cuXR2xKEmgDEDbli0ROftjVO27K Ia0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788202030; x=1788806830; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=lWHgwZjI8PJHAdOh0hOZPcNPrnvuZLiyr/mlCNOBOjU=; b=TCyuzvVHaELk1bWsENln6tCZ0fOIPi9p6I+B5yjkTKeENlXCDqpeXUpx4+0TGjUUCo 4/8zweJzfTDnrufLOvE8pZB5tjV/+PxTGYpcVcULKjNaece/hRl7tfBeJV/Kp/CCKr/h e+HYN+wk0XKb6V5DmuhAOqKxbDspCxbl+QO6wHf5RlPPdz8BPJlj03P3cMSimY1jHUUv puVXGEEiG8cZ8qYofVRHH8ruys53EQbXTE+RIkGexVUhBpcJfQQR0bRUlaogQJclkN+6 hQQTubE5MZw49dUylNG4U0XsvJcArRm9oPw4uHHi4SVkKBs19pe+vTUjcIl3mvs2oM4w AUaQ== X-Forwarded-Encrypted: i=1; AKwUvBzUSbXJjOR2NY09xt+C1ZxJ4hdaTOBYH9/Xw95otVVsvY2qzruAEFYOz8kTZXNm/3VKmhQGTs3yAzy3wJ0=@vger.kernel.org X-Gm-Message-State: AFuF++kSvwRilX3AgSweDAO1OppbzFpOnstmeH8Kh3T5rKgmEDlefZYG jQA9Wwb2ezgYuc3sdHyg4eAzJGVozyBwnWvoWPPh+ahpOSpoUk0QGtz+ X-Gm-Gg: AYBFou1dJu28WpXmCOO7s3pZ+eL94fG93jiniy1oLCCQZPlIs+ZO9a8oVjy7B1Zpl8F NtdHofOY1dJg6nkQckLrr7pCVFVxPIAgkiYM6vIwagQEhRkuk4qtWmfEVzynM/WIKnWCLlUsZ0W oaF2uoULN6iy5FWvqsXDgMsKQN8NrLCOC3r7FdDdb/GAT6VkPk6JkShDXSdSh7xCdRfFDTfwP+Z tkuwfgPaTHOXHkrjf9rNrpNFAnfstpxxsmKIxTV7Qenpd4d5uCMPDdg4/GU+MGw7qmQ3VtX1in9 cmwNAzD7iBfYkxKA9H6fCK5ynADnxuRmhJqsckwqn/J+oPXyYsyGXzHnSWG8OV3VS2fwMUdOiup RKk2EzEqUhRS5UllGco8Co631VzKGefkeaaZ4bb8Stimo6abioHnZLMMvWOaSInCLamBzfnfIz7 xrJFukWSLTP58oKz/govMkrHVcYagfFzNYZ/gLZ6byVL1+Lqfju0y4NljPsuS6UEsgpEq1+96hm Ckrj2F/ X-Received: by 2002:a17:90a:a81:b0:398:d6f4:c61a with SMTP id 98e67ed59e1d1-398d6f4c86dmr12291951a91.17.1788202030379; Mon, 31 Aug 2026 11:47:10 -0700 (PDT) Received: from DESKTOP-M0MLFVC.localdomain ([165.99.41.159]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-142e0dc854dsm29459223c88.10.2026.08.31.11.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 11:47:09 -0700 (PDT) From: Shehryar Ahmad To: jic23@kernel.org Cc: nuno.sa@analog.com, Michael.Hennerich@analog.com, dlechner@baylibre.com, andy@kernel.org, gregkh@linuxfoundation.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linux@analog.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, marcelo.schmitt1@gmail.com, danascape@gmail.com, Shehryar Ahmad Subject: [PATCH 1/3] iio: accel: adis16201: merge adis16203 support from staging Date: Mon, 31 Aug 2026 23:41:59 +0500 Message-ID: <20260831184201.34416-2-shehryar.amd@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831184201.34416-1-shehryar.amd@gmail.com> References: <20260831184201.34416-1-shehryar.amd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Merge the ADIS16203 360 degree inclinometer driver from staging to mainline ADIS16201 driver. Register addresses and external SPI interface are identical between both. Some things that differ like write mask, and calibbias bit width are handled by per chip struct differ_info, handled by of_device_id match data in probe, following the same pattern used in adis16475 which selects per-chip data directly via of_device_id.data and spi_get_device_match_data(), adis16480 does similar but via a different mechanism (index into an array via the SPI ID table). Channels arrays are kept separate to avoid dropping const and kmemdup would be extra failure point if memory allocation fails and is memory inefficient. GENMASK is still same instead of range check to keep adis16201 behaviour unchanged Signed-off-by: Shehryar Ahmad --- drivers/iio/accel/adis16201.c | 289 ++++++++++++++++++++-------------- 1 file changed, 174 insertions(+), 115 deletions(-) diff --git a/drivers/iio/accel/adis16201.c b/drivers/iio/accel/adis16201.c index ba0f97944..ee8efeed2 100644 --- a/drivers/iio/accel/adis16201.c +++ b/drivers/iio/accel/adis16201.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer + * Analog Devices ADIS16201 Inclinometer/Accelerometer and ADIS16203 Incli= nometer Driver * * Copyright 2010 Analog Devices Inc. */ @@ -13,93 +13,187 @@ #include #include =20 -#define ADIS16201_STARTUP_DELAY_MS 220 -#define ADIS16201_FLASH_CNT 0x00 +#define ADIS16201_STARTUP_DELAY_MS 220 +#define ADIS16201_FLASH_CNT 0x00 =20 /* Data Output Register Information */ -#define ADIS16201_SUPPLY_OUT_REG 0x02 -#define ADIS16201_XACCL_OUT_REG 0x04 -#define ADIS16201_YACCL_OUT_REG 0x06 -#define ADIS16201_AUX_ADC_REG 0x08 -#define ADIS16201_TEMP_OUT_REG 0x0A -#define ADIS16201_XINCL_OUT_REG 0x0C -#define ADIS16201_YINCL_OUT_REG 0x0E +#define ADIS16201_SUPPLY_OUT_REG 0x02 +#define ADIS16201_XACCL_OUT_REG 0x04 +#define ADIS16201_YACCL_OUT_REG 0x06 +#define ADIS16201_AUX_ADC_REG 0x08 +#define ADIS16201_TEMP_OUT_REG 0x0A +#define ADIS16201_INCL_OUT_REG 0x0C +#define ADIS16201_YINCL_OUT_REG 0x0E =20 /* Calibration Register Definition */ -#define ADIS16201_XACCL_OFFS_REG 0x10 -#define ADIS16201_YACCL_OFFS_REG 0x12 -#define ADIS16201_XACCL_SCALE_REG 0x14 -#define ADIS16201_YACCL_SCALE_REG 0x16 -#define ADIS16201_XINCL_OFFS_REG 0x18 -#define ADIS16201_YINCL_OFFS_REG 0x1A -#define ADIS16201_XINCL_SCALE_REG 0x1C -#define ADIS16201_YINCL_SCALE_REG 0x1E +#define ADIS16201_XACCL_OFFS_REG 0x10 +#define ADIS16201_YACCL_OFFS_REG 0x12 +#define ADIS16201_XACCL_SCALE_REG 0x14 +#define ADIS16201_YACCL_SCALE_REG 0x16 +#define ADIS16201_INCL_OFFS_REG 0x18 +#define ADIS16201_YINCL_OFFS_REG 0x1A +#define ADIS16201_XINCL_SCALE_REG 0x1C +#define ADIS16201_YINCL_SCALE_REG 0x1E =20 /* Alarm Register Definition */ -#define ADIS16201_ALM_MAG1_REG 0x20 -#define ADIS16201_ALM_MAG2_REG 0x22 -#define ADIS16201_ALM_SMPL1_REG 0x24 -#define ADIS16201_ALM_SMPL2_REG 0x26 -#define ADIS16201_ALM_CTRL_REG 0x28 - -#define ADIS16201_AUX_DAC_REG 0x30 -#define ADIS16201_GPIO_CTRL_REG 0x32 -#define ADIS16201_SMPL_PRD_REG 0x36 +#define ADIS16201_ALM_MAG1_REG 0x20 +#define ADIS16201_ALM_MAG2_REG 0x22 +#define ADIS16201_ALM_SMPL1_REG 0x24 +#define ADIS16201_ALM_SMPL2_REG 0x26 +#define ADIS16201_ALM_CTRL_REG 0x28 + +#define ADIS16201_AUX_DAC_REG 0x30 +#define ADIS16201_GPIO_CTRL_REG 0x32 +#define ADIS16201_SMPL_PRD_REG 0x36 + /* Operation, filter configuration */ -#define ADIS16201_AVG_CNT_REG 0x38 -#define ADIS16201_SLP_CNT_REG 0x3A +#define ADIS16201_AVG_CNT_REG 0x38 +#define ADIS16201_SLP_CNT_REG 0x3A =20 /* Miscellaneous Control Register Definition */ -#define ADIS16201_MSC_CTRL_REG 0x34 -#define ADIS16201_MSC_CTRL_SELF_TEST_EN BIT(8) +#define ADIS16201_MSC_CTRL_REG 0x34 +#define ADIS16201_MSC_CTRL_SELF_TEST_EN BIT(8) /* Data-ready enable: 1 =3D enabled, 0 =3D disabled */ -#define ADIS16201_MSC_CTRL_DATA_RDY_EN BIT(2) +#define ADIS16201_MSC_CTRL_DATA_RDY_EN BIT(2) /* Data-ready polarity: 1 =3D active high, 0 =3D active low */ #define ADIS16201_MSC_CTRL_ACTIVE_DATA_RDY_HIGH BIT(1) /* Data-ready line selection: 1 =3D DIO1, 0 =3D DIO0 */ -#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1 BIT(0) +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1 BIT(0) =20 /* Diagnostics System Status Register Definition */ -#define ADIS16201_DIAG_STAT_REG 0x3C -#define ADIS16201_DIAG_STAT_ALARM2 BIT(9) -#define ADIS16201_DIAG_STAT_ALARM1 BIT(8) -#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT 3 +#define ADIS16201_DIAG_STAT_REG 0x3C +#define ADIS16201_DIAG_STAT_ALARM2 BIT(9) +#define ADIS16201_DIAG_STAT_ALARM1 BIT(8) +#define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5 +#define ADIS16201_DIAG_STAT_SPI_FAIL_BIT 3 #define ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT 2 /* Power supply above 3.625 V */ -#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1 +#define ADIS16201_DIAG_STAT_POWER_HIGH_BIT 1 /* Power supply below 2.975 V */ -#define ADIS16201_DIAG_STAT_POWER_LOW_BIT 0 +#define ADIS16201_DIAG_STAT_POWER_LOW_BIT 0 =20 /* System Command Register Definition */ -#define ADIS16201_GLOB_CMD_REG 0x3E -#define ADIS16201_GLOB_CMD_SW_RESET BIT(7) -#define ADIS16201_GLOB_CMD_FACTORY_RESET BIT(1) +#define ADIS16201_GLOB_CMD_REG 0x3E +#define ADIS16201_GLOB_CMD_SW_RESET BIT(7) +#define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4) +#define ADIS16201_GLOB_CMD_FACTORY_RESET BIT(1) =20 -#define ADIS16201_ERROR_ACTIVE BIT(14) +#define ADIS16201_ERROR_ACTIVE BIT(14) =20 enum adis16201_scan { - ADIS16201_SCAN_ACC_X, - ADIS16201_SCAN_ACC_Y, - ADIS16201_SCAN_INCLI_X, - ADIS16201_SCAN_INCLI_Y, ADIS16201_SCAN_SUPPLY, - ADIS16201_SCAN_AUX_ADC, ADIS16201_SCAN_TEMP, + ADIS16201_SCAN_AUX_ADC, + ADIS16201_SCAN_INCLI, + ADIS16201_SCAN_INCLI_Y, + ADIS16201_SCAN_ACC_X, + ADIS16201_SCAN_ACC_Y, }; =20 static const u8 adis16201_addresses[] =3D { [ADIS16201_SCAN_ACC_X] =3D ADIS16201_XACCL_OFFS_REG, [ADIS16201_SCAN_ACC_Y] =3D ADIS16201_YACCL_OFFS_REG, - [ADIS16201_SCAN_INCLI_X] =3D ADIS16201_XINCL_OFFS_REG, + [ADIS16201_SCAN_INCLI] =3D ADIS16201_INCL_OFFS_REG, [ADIS16201_SCAN_INCLI_Y] =3D ADIS16201_YINCL_OFFS_REG, }; =20 +static const struct iio_chan_spec adis16201_channels[] =3D { + ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT_REG, ADIS16201_SCAN_SUPPLY, + 0, 12), + ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT_REG, ADIS16201_SCAN_TEMP, 0, 12), + ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT_REG, ADIS16201_SCAN_ACC_X, + BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), + ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT_REG, ADIS16201_SCAN_ACC_Y, + BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), + ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC_REG, ADIS16201_SCAN_AUX_ADC, 0, 12), + ADIS_INCLI_CHAN(X, ADIS16201_INCL_OUT_REG, ADIS16201_SCAN_INCLI, + BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 12), + ADIS_INCLI_CHAN(Y, ADIS16201_YINCL_OUT_REG, ADIS16201_SCAN_INCLI_Y, + BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 12), + IIO_CHAN_SOFT_TIMESTAMP(7) +}; + +static const struct iio_chan_spec adis16203_channels[] =3D { + ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT_REG, ADIS16201_SCAN_SUPPLY, 0, 12), + ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC_REG, ADIS16201_SCAN_AUX_ADC, 0, 12), + ADIS_INCLI_CHAN(X, ADIS16201_INCL_OUT_REG, ADIS16201_SCAN_INCLI, + BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), + ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT_REG, ADIS16201_SCAN_TEMP, 0, 12), + IIO_CHAN_SOFT_TIMESTAMP(4) +}; + +struct differ_info { + u16 write_mask_incli; + unsigned int incli_scale_val2; + unsigned int read_bits_incli; + const struct iio_chan_spec *arr_chans; + u16 diag_stat_mask; + unsigned int num_chans; +}; + +static const struct differ_info adis16201_diff =3D { + .write_mask_incli =3D GENMASK(8, 0), + .incli_scale_val2 =3D 100000, + .read_bits_incli =3D 9, + .arr_chans =3D adis16201_channels, + .diag_stat_mask =3D BIT(ADIS16201_DIAG_STAT_SPI_FAIL_BIT) | + BIT(ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT) | + BIT(ADIS16201_DIAG_STAT_POWER_HIGH_BIT) | + BIT(ADIS16201_DIAG_STAT_POWER_LOW_BIT), + .num_chans =3D ARRAY_SIZE(adis16201_channels) +}; + +static const struct differ_info adis16203_diff =3D { + .write_mask_incli =3D GENMASK(13, 0), + .incli_scale_val2 =3D 25000, + .read_bits_incli =3D 14, + .arr_chans =3D adis16203_channels, + .diag_stat_mask =3D BIT(ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT) | + BIT(ADIS16201_DIAG_STAT_SPI_FAIL_BIT) | + BIT(ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT) | + BIT(ADIS16201_DIAG_STAT_POWER_HIGH_BIT) | + BIT(ADIS16201_DIAG_STAT_POWER_LOW_BIT), + .num_chans =3D ARRAY_SIZE(adis16203_channels) +}; + +struct adis16201_state { + struct adis adis; + const struct differ_info *info; +}; + +static int adis16201_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, + int val2, + long mask) +{ + struct adis16201_state *st =3D iio_priv(indio_dev); + int m; + + if (mask !=3D IIO_CHAN_INFO_CALIBBIAS) + return -EINVAL; + + switch (chan->type) { + case IIO_ACCEL: + m =3D GENMASK(11, 0); + break; + case IIO_INCLI: + m =3D st->info->write_mask_incli; + break; + default: + return -EINVAL; + } + + return adis_write_reg_16(&st->adis, adis16201_addresses[chan->scan_index], + val & m); +} + static int adis16201_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, - int *val, int *val2, - long mask) + int *val, + int *val2, long mask) { - struct adis *st =3D iio_priv(indio_dev); + struct adis16201_state *st =3D iio_priv(indio_dev); int ret; int bits; u8 addr; @@ -126,6 +220,11 @@ static int adis16201_read_raw(struct iio_dev *indio_de= v, *val =3D -470; *val2 =3D 0; return IIO_VAL_INT_PLUS_MICRO; + + case IIO_INCLI: + *val =3D 0; + *val2 =3D st->info->incli_scale_val2; + return IIO_VAL_INT_PLUS_MICRO; case IIO_ACCEL: /* * IIO base unit for sensitivity of accelerometer @@ -135,10 +234,6 @@ static int adis16201_read_raw(struct iio_dev *indio_de= v, *val =3D 0; *val2 =3D IIO_G_TO_M_S_2(462400); return IIO_VAL_INT_PLUS_NANO; - case IIO_INCLI: - *val =3D 0; - *val2 =3D 100000; - return IIO_VAL_INT_PLUS_MICRO; default: return -EINVAL; } @@ -157,13 +252,13 @@ static int adis16201_read_raw(struct iio_dev *indio_d= ev, bits =3D 12; break; case IIO_INCLI: - bits =3D 9; + bits =3D st->info->read_bits_incli; break; default: return -EINVAL; } addr =3D adis16201_addresses[chan->scan_index]; - ret =3D adis_read_reg_16(st, addr, &val16); + ret =3D adis_read_reg_16(&st->adis, addr, &val16); if (ret) return ret; =20 @@ -174,49 +269,6 @@ static int adis16201_read_raw(struct iio_dev *indio_de= v, return -EINVAL; } =20 -static int adis16201_write_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, - int val, - int val2, - long mask) -{ - struct adis *st =3D iio_priv(indio_dev); - int m; - - if (mask !=3D IIO_CHAN_INFO_CALIBBIAS) - return -EINVAL; - - switch (chan->type) { - case IIO_ACCEL: - m =3D GENMASK(11, 0); - break; - case IIO_INCLI: - m =3D GENMASK(8, 0); - break; - default: - return -EINVAL; - } - - return adis_write_reg_16(st, adis16201_addresses[chan->scan_index], - val & m); -} - -static const struct iio_chan_spec adis16201_channels[] =3D { - ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT_REG, ADIS16201_SCAN_SUPPLY, 0, - 12), - ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT_REG, ADIS16201_SCAN_TEMP, 0, 12), - ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT_REG, ADIS16201_SCAN_ACC_X, - BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), - ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT_REG, ADIS16201_SCAN_ACC_Y, - BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), - ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC_REG, ADIS16201_SCAN_AUX_ADC, 0, 12), - ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT_REG, ADIS16201_SCAN_INCLI_X, - BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 12), - ADIS_INCLI_CHAN(Y, ADIS16201_YINCL_OUT_REG, ADIS16201_SCAN_INCLI_Y, - BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 12), - IIO_CHAN_SOFT_TIMESTAMP(7) -}; - static const struct iio_info adis16201_info =3D { .read_raw =3D adis16201_read_raw, .write_raw =3D adis16201_write_raw, @@ -224,6 +276,7 @@ static const struct iio_info adis16201_info =3D { }; =20 static const char * const adis16201_status_error_msgs[] =3D { + [ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT] =3D "Self test failure", [ADIS16201_DIAG_STAT_SPI_FAIL_BIT] =3D "SPI failure", [ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT] =3D "Flash update failed", [ADIS16201_DIAG_STAT_POWER_HIGH_BIT] =3D "Power supply above 3.625V", @@ -248,56 +301,62 @@ static const struct adis_data adis16201_data =3D { .timeouts =3D &adis16201_timeouts, =20 .status_error_msgs =3D adis16201_status_error_msgs, - .status_error_mask =3D BIT(ADIS16201_DIAG_STAT_SPI_FAIL_BIT) | - BIT(ADIS16201_DIAG_STAT_FLASH_UPT_FAIL_BIT) | - BIT(ADIS16201_DIAG_STAT_POWER_HIGH_BIT) | - BIT(ADIS16201_DIAG_STAT_POWER_LOW_BIT), }; =20 static int adis16201_probe(struct spi_device *spi) { struct iio_dev *indio_dev; - struct adis *st; + struct adis16201_state *st; + struct adis_data data =3D adis16201_data; int ret; =20 - indio_dev =3D devm_iio_device_alloc(&spi->dev, sizeof(*st)); + indio_dev =3D devm_iio_device_alloc(&spi->dev, sizeof(struct adis16201_st= ate)); if (!indio_dev) return -ENOMEM; =20 st =3D iio_priv(indio_dev); + st->info =3D spi_get_device_match_data(spi); =20 indio_dev->name =3D spi->dev.driver->name; indio_dev->info =3D &adis16201_info; - - indio_dev->channels =3D adis16201_channels; - indio_dev->num_channels =3D ARRAY_SIZE(adis16201_channels); + indio_dev->channels =3D st->info->arr_chans; + indio_dev->num_channels =3D st->info->num_chans; indio_dev->modes =3D INDIO_DIRECT_MODE; =20 - ret =3D adis_init(st, indio_dev, spi, &adis16201_data); + data.status_error_mask =3D st->info->diag_stat_mask; + ret =3D adis_init(&st->adis, indio_dev, spi, &data); if (ret) return ret; =20 - ret =3D devm_adis_setup_buffer_and_trigger(st, indio_dev, NULL); + ret =3D devm_adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL); if (ret) return ret; =20 - ret =3D __adis_initial_startup(st); + ret =3D __adis_initial_startup(&st->adis); if (ret) return ret; =20 return devm_iio_device_register(&spi->dev, indio_dev); } =20 +static const struct of_device_id adis16201_of_match[] =3D { + { .compatible =3D "adi,adis16201", .data =3D &adis16201_diff }, + { .compatible =3D "adi,adis16203", .data =3D &adis16203_diff }, + { } +}; + static struct spi_driver adis16201_driver =3D { .driver =3D { - .name =3D "adis16201", + .name =3D "adis16201_adis16203", + .of_match_table =3D adis16201_of_match, }, .probe =3D adis16201_probe, }; module_spi_driver(adis16201_driver); =20 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>"); -MODULE_DESCRIPTION("Analog Devices ADIS16201 Dual-Axis Digital Inclinomete= r and Accelerometer"); +MODULE_DESCRIPTION("Analog Devices ADIS16201 Inclinometer/Accelerometer an= d ADIS16203 Inclinometer Driver"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("spi:adis16201"); +MODULE_ALIAS("spi:adis16203"); MODULE_IMPORT_NS("IIO_ADISLIB"); --=20 2.43.0 From nobody Sat Sep 26 15:34:45 2026 Received: from mail-pj2-f11.google.com (mail-pj2-f11.google.com [74.125.227.139]) (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 DDFC03FCC for ; Mon, 31 Aug 2026 18:49:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.139 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202196; cv=none; b=Ta7UMgbGs2uEhSiNIAqqrzvRcuhOJWWkQl/Ef20T4rCrglQnQIha0IcFtJfwEeMhru+62+hzrB/WLINvxMORzbV9hpIQrmPn70oQGJw8Lq5st4z8fbTMon5OGKtLJifwsjHCy3Uxpa6rZ2UFQWatneK1FZuAl/Ity3taGf7sCQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202196; c=relaxed/simple; bh=s3529gY1qIH6BXguBj4CoPENBg/23IaE8IfkBpE26AY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qAfxqsyrI+LYfAoruN8T7pea4h4NVmumWP7QzFsaDTV4EX7oWHm90c6Z9q5VwZbcLLs2MTmsOzgf4JjjqEQmj2W+YqkaSKpxuVSBG67y4/IwlW8/WLL7WAgj7zcUA7AHKu1eJRCC0NWCUkgUW1BntPqgzgu5qmRnpfm3hgSq72k= 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=NLSWbKWt; arc=none smtp.client-ip=74.125.227.139 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="NLSWbKWt" Received: by mail-pj2-f11.google.com with SMTP id 98e67ed59e1d1-38de693676dso2266257a91.0 for ; Mon, 31 Aug 2026 11:49:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788202194; x=1788806994; 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:content-type; bh=m/QhCbTqT6PSPkMVYrCRegnwUxdw0V8vfoEBgpC5gqI=; b=NLSWbKWtcOXPF3nMUxpBHgIZmDMs272wkOa0SR3sedh3OqkrZInPv64hHxdLp8N4zE KRqtpEIIn+reQB7//1LwzSBEcu/O+2rRjYTkDHwl6J9NHcoivGdC0OZ+9Oe7ptD6ZGzt fXhpSqqdjSox3OpSqjDzPEi0oU4/E3KSUmNJntv90uLrJwk9wI28jTrMFDiW9BhW3uE2 OTNZnXmm3YlVfHCaMi72JdLDxhxnR99dehVvnpxisnPpXXWkACGGGyRKxdC5l8Oo7fBA YSREUFIsfnFbPM5U0icw4VydUQAtGEWVuTn9vtsHOK35GJFPowslqsKMsvu+ru81xis3 a6Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788202194; x=1788806994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=m/QhCbTqT6PSPkMVYrCRegnwUxdw0V8vfoEBgpC5gqI=; b=DERgc/BIy0LSdtIst9y0Te/QmpKH9rFXu/HgSXlGdrf0jm6fzstiHd57QtQoWJzclC 1asoH3aGCDhKoFN//9dL/+xZuPzcRgHU2G2ua9GCoH0Uvjy7PBX/PrL6BaGpYt/qplxp g+lBbBm9cdrEGp0lpWh4eQlwhMnxri82ks4sSGJQaIndOzERZEp8wLRCiKGkcgOWmT3q 266N3U7cZYm5sUQlyVzsp8tPpTHGQQJ/tYTpjWPmhLE2xhLhEyGocvkV479lo/vgFe5l W+LhcUTJjEPQtCiFYsOuYdHPVDmqFOOAXS9iM7A2vG5hGHcMPKCZJtqsbgoMAPZ32xwB dimQ== X-Forwarded-Encrypted: i=1; AKwUvByoum7PJ6za70YUv8HBqN4jg9AnM17xTTsuwVCDK02mVc6HIKozvTf+/gyaGg65zRjRClDzd46cljh6zMk=@vger.kernel.org X-Gm-Message-State: AFuF++lJFOKyDCtoGwoiyox1EQ+Fu95JIaXeZeL46Xx1KyRDhU5zaO1x 8O+Qgeset9cQrNStSOdNmGslS4wXkoR7Fb/4Hw1EMQUC5TycLnYtqtxm X-Gm-Gg: AYBFou3MpNXDBEfRNlNqrZFuz+xRjW1OKbhDyU1c0l8Mj4imT/e0W3yLC7FRxYt/2kF SPzvc/LXREeYmmJ3VarTL1JyOAs1n0PQZkKBS6JZVArQdm/dIHafKPf8odyXZr7pGAm2oQJzAEY 66j0aM5RITwrAZJ+rpmMhDgKjtkUt9XQflGLxnVP4fFJmgIJnXN7kAJHF7+WqkTnXTogzHoV3Wy cR1lmsAkycD1y+QJLQaleJWXS/5c9zXZP0YU5qqZNGtr8brvhKQkaA87NY8+Z+Mo/LnCVtiyzhA 0o5YzeGOtlCpEErVI9IJ7WwNzCCpENuTrGZQIXM3uaNa9tjpa/gNM8KsoFUjxSSY5ZGQV1PS2qT PEZtBehDA0vKspz+HeeMWLBr0WnHsRvfo1PZoyXGlmrNGpqh4kt4sAsJ9B17/9Wb78IL0p23gxF egO+5Qol/bVg06r3z2yuajpNtd94ESdA6A98QtI1HZmFMz/XqmHM3WBQkcfWui8TvPGQBK+pzvE uZuj9OP X-Received: by 2002:a17:90a:d407:b0:398:e73e:5a13 with SMTP id 98e67ed59e1d1-39907bbe00cmr3954695a91.9.1788202194123; Mon, 31 Aug 2026 11:49:54 -0700 (PDT) Received: from DESKTOP-M0MLFVC.localdomain ([165.99.41.159]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-142e0dc854dsm29459223c88.10.2026.08.31.11.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 11:49:53 -0700 (PDT) From: Shehryar Ahmad To: jic23@kernel.org Cc: nuno.sa@analog.com, Michael.Hennerich@analog.com, dlechner@baylibre.com, andy@kernel.org, gregkh@linuxfoundation.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linux@analog.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, marcelo.schmitt1@gmail.com, danascape@gmail.com, Shehryar Ahmad Subject: [PATCH 2/3] staging: iio: accel: remove adis16203, merged into mainline adis16201 driver Date: Mon, 31 Aug 2026 23:42:00 +0500 Message-ID: <20260831184201.34416-3-shehryar.amd@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831184201.34416-1-shehryar.amd@gmail.com> References: <20260831184201.34416-1-shehryar.amd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ADIS16203 is merged with mainline ADIS16201 in previous patch of series, remove the staging copy and its build system entries. Signed-off-by: Shehryar Ahmad Reviewed-by: Andy Shevchenko --- drivers/staging/iio/Kconfig | 1 - drivers/staging/iio/Makefile | 1 - drivers/staging/iio/accel/Kconfig | 19 -- drivers/staging/iio/accel/Makefile | 6 - drivers/staging/iio/accel/adis16203.c | 315 -------------------------- 5 files changed, 342 deletions(-) delete mode 100644 drivers/staging/iio/accel/Kconfig delete mode 100644 drivers/staging/iio/accel/Makefile delete mode 100644 drivers/staging/iio/accel/adis16203.c diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig index a60631c1f..bf6addf29 100644 --- a/drivers/staging/iio/Kconfig +++ b/drivers/staging/iio/Kconfig @@ -5,7 +5,6 @@ menu "IIO staging drivers" depends on IIO =20 -source "drivers/staging/iio/accel/Kconfig" source "drivers/staging/iio/adc/Kconfig" source "drivers/staging/iio/addac/Kconfig" source "drivers/staging/iio/frequency/Kconfig" diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index 628583535..739e4cbf9 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile @@ -3,7 +3,6 @@ # Makefile for the industrial I/O core. # =20 -obj-y +=3D accel/ obj-y +=3D adc/ obj-y +=3D addac/ obj-y +=3D frequency/ diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/= Kconfig deleted file mode 100644 index cee51f64b..000000000 --- a/drivers/staging/iio/accel/Kconfig +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Accelerometer drivers -# -menu "Accelerometers" - -config ADIS16203 - tristate "Analog Devices ADIS16203 Programmable 360 Degrees Inclinometer" - depends on SPI - select IIO_ADIS_LIB - select IIO_ADIS_LIB_BUFFER if IIO_BUFFER - help - Say Y here to build support for Analog Devices adis16203 Programmable - 360 Degrees Inclinometer. - - To compile this driver as a module, say M here: the module will be - called adis16203. - -endmenu diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel= /Makefile deleted file mode 100644 index acac7bc9b..000000000 --- a/drivers/staging/iio/accel/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for industrial I/O accelerometer drivers -# - -obj-$(CONFIG_ADIS16203) +=3D adis16203.o diff --git a/drivers/staging/iio/accel/adis16203.c b/drivers/staging/iio/ac= cel/adis16203.c deleted file mode 100644 index 830ff38fd..000000000 --- a/drivers/staging/iio/accel/adis16203.c +++ /dev/null @@ -1,315 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * ADIS16203 Programmable 360 Degrees Inclinometer - * - * Copyright 2010 Analog Devices Inc. - */ - -#include - -#include -#include - -#include -#include -#include - -#define ADIS16203_STARTUP_DELAY 220 /* ms */ - -/* Flash memory write count */ -#define ADIS16203_FLASH_CNT 0x00 - -/* Output, power supply */ -#define ADIS16203_SUPPLY_OUT 0x02 - -/* Output, auxiliary ADC input */ -#define ADIS16203_AUX_ADC 0x08 - -/* Output, temperature */ -#define ADIS16203_TEMP_OUT 0x0A - -/* Output, x-axis inclination */ -#define ADIS16203_XINCL_OUT 0x0C - -/* Output, y-axis inclination */ -#define ADIS16203_YINCL_OUT 0x0E - -/* Incline null calibration */ -#define ADIS16203_INCL_NULL 0x18 - -/* Alarm 1 amplitude threshold */ -#define ADIS16203_ALM_MAG1 0x20 - -/* Alarm 2 amplitude threshold */ -#define ADIS16203_ALM_MAG2 0x22 - -/* Alarm 1, sample period */ -#define ADIS16203_ALM_SMPL1 0x24 - -/* Alarm 2, sample period */ -#define ADIS16203_ALM_SMPL2 0x26 - -/* Alarm control */ -#define ADIS16203_ALM_CTRL 0x28 - -/* Auxiliary DAC data */ -#define ADIS16203_AUX_DAC 0x30 - -/* General-purpose digital input/output control */ -#define ADIS16203_GPIO_CTRL 0x32 - -/* Miscellaneous control */ -#define ADIS16203_MSC_CTRL 0x34 - -/* Internal sample period (rate) control */ -#define ADIS16203_SMPL_PRD 0x36 - -/* Operation, filter configuration */ -#define ADIS16203_AVG_CNT 0x38 - -/* Operation, sleep mode control */ -#define ADIS16203_SLP_CNT 0x3A - -/* Diagnostics, system status register */ -#define ADIS16203_DIAG_STAT 0x3C - -/* Operation, system command register */ -#define ADIS16203_GLOB_CMD 0x3E - -/* MSC_CTRL */ - -/* Self-test at power-on: 1 =3D disabled, 0 =3D enabled */ -#define ADIS16203_MSC_CTRL_PWRUP_SELF_TEST BIT(10) - -/* Reverses rotation of both inclination outputs */ -#define ADIS16203_MSC_CTRL_REVERSE_ROT_EN BIT(9) - -/* Self-test enable */ -#define ADIS16203_MSC_CTRL_SELF_TEST_EN BIT(8) - -/* Data-ready enable: 1 =3D enabled, 0 =3D disabled */ -#define ADIS16203_MSC_CTRL_DATA_RDY_EN BIT(2) - -/* Data-ready polarity: 1 =3D active high, 0 =3D active low */ -#define ADIS16203_MSC_CTRL_ACTIVE_HIGH BIT(1) - -/* Data-ready line selection: 1 =3D DIO1, 0 =3D DIO0 */ -#define ADIS16203_MSC_CTRL_DATA_RDY_DIO1 BIT(0) - -/* DIAG_STAT */ - -/* Alarm 2 status: 1 =3D alarm active, 0 =3D alarm inactive */ -#define ADIS16203_DIAG_STAT_ALARM2 BIT(9) - -/* Alarm 1 status: 1 =3D alarm active, 0 =3D alarm inactive */ -#define ADIS16203_DIAG_STAT_ALARM1 BIT(8) - -/* Self-test diagnostic error flag */ -#define ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT 5 - -/* SPI communications failure */ -#define ADIS16203_DIAG_STAT_SPI_FAIL_BIT 3 - -/* Flash update failure */ -#define ADIS16203_DIAG_STAT_FLASH_UPT_BIT 2 - -/* Power supply above 3.625 V */ -#define ADIS16203_DIAG_STAT_POWER_HIGH_BIT 1 - -/* Power supply below 2.975 V */ -#define ADIS16203_DIAG_STAT_POWER_LOW_BIT 0 - -/* GLOB_CMD */ - -#define ADIS16203_GLOB_CMD_SW_RESET BIT(7) -#define ADIS16203_GLOB_CMD_CLEAR_STAT BIT(4) -#define ADIS16203_GLOB_CMD_FACTORY_CAL BIT(1) - -#define ADIS16203_ERROR_ACTIVE BIT(14) - -enum adis16203_scan { - ADIS16203_SCAN_INCLI_X, - ADIS16203_SCAN_INCLI_Y, - ADIS16203_SCAN_SUPPLY, - ADIS16203_SCAN_AUX_ADC, - ADIS16203_SCAN_TEMP, -}; - -#define DRIVER_NAME "adis16203" - -static const u8 adis16203_addresses[] =3D { - [ADIS16203_SCAN_INCLI_X] =3D ADIS16203_INCL_NULL, -}; - -static int adis16203_write_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, - int val, - int val2, - long mask) -{ - struct adis *st =3D iio_priv(indio_dev); - /* currently only one writable parameter which keeps this simple */ - u8 addr =3D adis16203_addresses[chan->scan_index]; - - return adis_write_reg_16(st, addr, val & 0x3FFF); -} - -static int adis16203_read_raw(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, - int *val, int *val2, - long mask) -{ - struct adis *st =3D iio_priv(indio_dev); - int ret; - u8 addr; - s16 val16; - - switch (mask) { - case IIO_CHAN_INFO_RAW: - return adis_single_conversion(indio_dev, chan, - ADIS16203_ERROR_ACTIVE, val); - case IIO_CHAN_INFO_SCALE: - switch (chan->type) { - case IIO_VOLTAGE: - if (chan->channel =3D=3D 0) { - *val =3D 1; - *val2 =3D 220000; /* 1.22 mV */ - } else { - *val =3D 0; - *val2 =3D 610000; /* 0.61 mV */ - } - return IIO_VAL_INT_PLUS_MICRO; - case IIO_TEMP: - *val =3D -470; /* -0.47 C */ - *val2 =3D 0; - return IIO_VAL_INT_PLUS_MICRO; - case IIO_INCLI: - *val =3D 0; - *val2 =3D 25000; /* 0.025 degree */ - return IIO_VAL_INT_PLUS_MICRO; - default: - return -EINVAL; - } - case IIO_CHAN_INFO_OFFSET: - *val =3D 25000 / -470 - 1278; /* 25 C =3D 1278 */ - return IIO_VAL_INT; - case IIO_CHAN_INFO_CALIBBIAS: - addr =3D adis16203_addresses[chan->scan_index]; - ret =3D adis_read_reg_16(st, addr, &val16); - if (ret) - return ret; - *val =3D sign_extend32(val16, 13); - return IIO_VAL_INT; - default: - return -EINVAL; - } -} - -static const struct iio_chan_spec adis16203_channels[] =3D { - ADIS_SUPPLY_CHAN(ADIS16203_SUPPLY_OUT, ADIS16203_SCAN_SUPPLY, 0, 12), - ADIS_AUX_ADC_CHAN(ADIS16203_AUX_ADC, ADIS16203_SCAN_AUX_ADC, 0, 12), - ADIS_INCLI_CHAN(X, ADIS16203_XINCL_OUT, ADIS16203_SCAN_INCLI_X, - BIT(IIO_CHAN_INFO_CALIBBIAS), 0, 14), - /* Fixme: Not what it appears to be - see data sheet */ - ADIS_INCLI_CHAN(Y, ADIS16203_YINCL_OUT, ADIS16203_SCAN_INCLI_Y, - 0, 0, 14), - ADIS_TEMP_CHAN(ADIS16203_TEMP_OUT, ADIS16203_SCAN_TEMP, 0, 12), - IIO_CHAN_SOFT_TIMESTAMP(5), -}; - -static const struct iio_info adis16203_info =3D { - .read_raw =3D adis16203_read_raw, - .write_raw =3D adis16203_write_raw, - .update_scan_mode =3D adis_update_scan_mode, -}; - -static const char * const adis16203_status_error_msgs[] =3D { - [ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT] =3D "Self test failure", - [ADIS16203_DIAG_STAT_SPI_FAIL_BIT] =3D "SPI failure", - [ADIS16203_DIAG_STAT_FLASH_UPT_BIT] =3D "Flash update failed", - [ADIS16203_DIAG_STAT_POWER_HIGH_BIT] =3D "Power supply above 3.625V", - [ADIS16203_DIAG_STAT_POWER_LOW_BIT] =3D "Power supply below 2.975V", -}; - -static const struct adis_timeout adis16203_timeouts =3D { - .reset_ms =3D ADIS16203_STARTUP_DELAY, - .sw_reset_ms =3D ADIS16203_STARTUP_DELAY, - .self_test_ms =3D ADIS16203_STARTUP_DELAY -}; - -static const struct adis_data adis16203_data =3D { - .read_delay =3D 20, - .msc_ctrl_reg =3D ADIS16203_MSC_CTRL, - .glob_cmd_reg =3D ADIS16203_GLOB_CMD, - .diag_stat_reg =3D ADIS16203_DIAG_STAT, - - .self_test_mask =3D ADIS16203_MSC_CTRL_SELF_TEST_EN, - .self_test_reg =3D ADIS16203_MSC_CTRL, - .self_test_no_autoclear =3D true, - .timeouts =3D &adis16203_timeouts, - - .status_error_msgs =3D adis16203_status_error_msgs, - .status_error_mask =3D BIT(ADIS16203_DIAG_STAT_SELFTEST_FAIL_BIT) | - BIT(ADIS16203_DIAG_STAT_SPI_FAIL_BIT) | - BIT(ADIS16203_DIAG_STAT_FLASH_UPT_BIT) | - BIT(ADIS16203_DIAG_STAT_POWER_HIGH_BIT) | - BIT(ADIS16203_DIAG_STAT_POWER_LOW_BIT), -}; - -static int adis16203_probe(struct spi_device *spi) -{ - int ret; - struct iio_dev *indio_dev; - struct adis *st; - - /* setup the industrialio driver allocated elements */ - indio_dev =3D devm_iio_device_alloc(&spi->dev, sizeof(*st)); - if (!indio_dev) - return -ENOMEM; - st =3D iio_priv(indio_dev); - /* this is only used for removal purposes */ - spi_set_drvdata(spi, indio_dev); - - indio_dev->name =3D spi->dev.driver->name; - indio_dev->channels =3D adis16203_channels; - indio_dev->num_channels =3D ARRAY_SIZE(adis16203_channels); - indio_dev->info =3D &adis16203_info; - indio_dev->modes =3D INDIO_DIRECT_MODE; - - ret =3D adis_init(st, indio_dev, spi, &adis16203_data); - if (ret) - return ret; - - ret =3D devm_adis_setup_buffer_and_trigger(st, indio_dev, NULL); - if (ret) - return ret; - - /* Get the device into a sane initial state */ - ret =3D __adis_initial_startup(st); - if (ret) - return ret; - - return devm_iio_device_register(&spi->dev, indio_dev); -} - -static const struct of_device_id adis16203_of_match[] =3D { - { .compatible =3D "adi,adis16203" }, - { } -}; - -MODULE_DEVICE_TABLE(of, adis16203_of_match); - -static struct spi_driver adis16203_driver =3D { - .driver =3D { - .name =3D "adis16203", - .of_match_table =3D adis16203_of_match, - }, - .probe =3D adis16203_probe, -}; -module_spi_driver(adis16203_driver); - -MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>"); -MODULE_DESCRIPTION("Analog Devices ADIS16203 Programmable 360 Degrees Incl= inometer"); -MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("spi:adis16203"); -MODULE_IMPORT_NS("IIO_ADISLIB"); --=20 2.43.0 From nobody Sat Sep 26 15:34:45 2026 Received: from mail-pj2-f8.google.com (mail-pj2-f8.google.com [74.125.227.136]) (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 97F1C38D402 for ; Mon, 31 Aug 2026 18:50:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.136 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202258; cv=none; b=VTX0pVx8WM+gwZ0faRDfik7K80iSEf9LOm6qlbm0+L5IDN5EmMxkOfr6sii5q7F/7ne2eBpueK8sjKHcbDK0Yn7EyoRZ+3pqsgmXpIztHaRHzm4cdKYd7uprLFpxFOUqc+m7k46j8d+nm3AiTknDxvwgQpwW2K9YBYNJRPcak/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788202258; c=relaxed/simple; bh=6hryHCIPCjgEQiYN3dv2fRXZ1WHHrAlyZRiHDL/ExVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OVQyNsCArkbC+bdAnSI63Ez54M0Lp3UQmwFxILmqYZ/G0GIP2Kh7d9TUTyKH9jYyhKPu/wYff5n9yAK/iJRXcdhJhe7KhnDV3mW8Vn8v3lVz1lDUqY/Q0DkaifuP19PVsLJCzvgf+q9H0VKMKmVHMHft558+a8tyovrhPvf506c= 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=H8+iA2r0; arc=none smtp.client-ip=74.125.227.136 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="H8+iA2r0" Received: by mail-pj2-f8.google.com with SMTP id 98e67ed59e1d1-398b9f722abso709573a91.0 for ; Mon, 31 Aug 2026 11:50:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788202256; x=1788807056; 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:content-type; bh=SU8TMnAJdFKhQ7rwVc1XtCTGG3xuVljaOpUMOXRsDlQ=; b=H8+iA2r0dXAz5s57zGwnd3Wsaofas5QSthjp04Lro/l3qdi82IQSxIS0kIzY/BLsuu 7iJWlayHGLKeBtqanb0a6D2wawGmBeRiJMxAbtnMJBOHISYTWEooh3pslg3a3caHJWMk fbwmk5y+CRAUQ7i2poa2J+oh+6C+GYW3/oeSlveGZsrfQ8V4onOa/6XpLcZYSQ3snfJ1 eZF9u/HKtjp6Mn86Ez1hGEHfdoIwdCvKhD8YrYBsFPPf2BWPmzZjd1aceVw5yuqc6oNB ZaKhuG94bmeuzPaKI6zUZuqbp/KsLDLX/JNhkoLC0y8RRpgE3iJuEqz0O7AkzvuZKG1y 8O0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788202256; x=1788807056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=SU8TMnAJdFKhQ7rwVc1XtCTGG3xuVljaOpUMOXRsDlQ=; b=EjTSo/naBk9Dw2oxEF/q/D6p1DqKnHBCEvrOFhmNgmqthMvVXFT4sNHSrQmOjtZH3A gQpWyBHTIx760/CPtEs3/IdKAI3O/YZZIiR3eZXElYa9TjfzGVltRQfXxkM9VTMIIFWc 5+yfu7O3cs6QWpwKzbuXrFdqeLqQRdcAl+DczDa3kII/ftIXsr5iXdhRLbYXWWZ8zTHR GU/I2+h4wBA8VpukoH+bKXorMfUVzdAg0pwC4H7qgb/aH4WJMCBQXAwrzNYg2iRRK6Ia eFDgFLa3LqtF9kFmYy77QV9NqL3UNh2q7ujcf7ONGQKuzNhkDC+XwWyIFlDkn5lvpyPY dcOQ== X-Forwarded-Encrypted: i=1; AKwUvBzHIZAV71fE9qydFvWyS4EmuWRYDh4tXpitPc2+o6Mbg/pQyrKkQHCe8BKG/i9wcdcXgZMAuOtxXAMm+5Q=@vger.kernel.org X-Gm-Message-State: AFuF++ld8Qvcg/eU0KYOez64G3CKxflkMhSIMdCch4m5dZKTOzgIXeS6 HLt4oRobv2ZNmI4g909nRfpptnptIqydUrWH+PZVNaADl9/u8qyobTTp X-Gm-Gg: AYBFou3tI8/aeHouB/Bu6inlZnl8HZDl3WBKiUpkcFWv0cLnibjy5kU005YRuB2v5We 27Y8SwsKOzlasI3h5o2xnt/1CiNVw2nc9cfghWpC3UGJSYRcq3wY1gqaKTSCK5lWJVxXAd0hSgi /qN2vSIWAVJA3atwG6+CoCUnoGpJXCLqo+rcSxK9SaH4TGxnNtBRlZLWMmadzlbwbGqy2rHG9+S Gseqn1w7X/rbpxYEoQX8vTLUALybA8KQ/iUhUSanesc2pusjvj6o4D9gscl/7m9iyTYL1AlvLU4 rnz1C2MSkZWtBvKxybDjyOnMCGOqV55FgAt8hP73gtpG/d09EfICtslVmdFcEK/GDM4hlHFHpcA 3ZcpY4YJye365mWWJEsiwgWgWy05Z3oQlMqTHaKoVDB21A+Kf20FXg5M4vx5YnW1hFzP4Etah39 ezIY9IHhY4d729XiZwG2Y6LU90AOWAzDOjAm/HDz2ZZsEPBE1NpYRQg0F7yYzgWFDto6NlTLq10 AvtfSuF X-Received: by 2002:a17:90b:2884:b0:398:c3c9:d0ae with SMTP id 98e67ed59e1d1-398c3c9d103mr19100460a91.0.1788202255729; Mon, 31 Aug 2026 11:50:55 -0700 (PDT) Received: from DESKTOP-M0MLFVC.localdomain ([165.99.41.159]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-142e0dc854dsm29459223c88.10.2026.08.31.11.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2026 11:50:55 -0700 (PDT) From: Shehryar Ahmad To: jic23@kernel.org Cc: nuno.sa@analog.com, Michael.Hennerich@analog.com, dlechner@baylibre.com, andy@kernel.org, gregkh@linuxfoundation.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, linux@analog.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, devicetree@vger.kernel.org, marcelo.schmitt1@gmail.com, danascape@gmail.com, Shehryar Ahmad Subject: [PATCH 3/3] dt-bindings: iio: accel: adi,adis16201: add adis16203 compatible Date: Mon, 31 Aug 2026 23:42:01 +0500 Message-ID: <20260831184201.34416-4-shehryar.amd@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260831184201.34416-1-shehryar.amd@gmail.com> References: <20260831184201.34416-1-shehryar.amd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The ADIS16203 has the same external interface as the already documented ADIS16201/ADIS16209, for the properties covered by this binding (compatible/reg, the DIO-based interrupt pin, and VDD supply), verified by datasheets Table 5, Pin Function Descriptions, in the respective Analog Devices datasheets. Some Auxiliary pins differ (e.g. adis16209 marks a few pins DNC where adis16201/adis16203 use them as AUX COM), but these are not represented in this binding. Add adis16203 to the existing enum rather than creating a separate file. Signed-off-by: Shehryar Ahmad Reviewed-by: Rob Herring (Arm) --- Reviewed-by: Rob Herring (Arm) Previously reviewed at: https://lore.kernel.org/all/20260812043506.456ced6d@jic23-huawei/ .../devicetree/bindings/iio/accel/adi,adis16201.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml= b/Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml index b6ba7ad1a..3ce5fb1be 100644 --- a/Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml +++ b/Documentation/devicetree/bindings/iio/accel/adi,adis16201.yaml @@ -4,21 +4,23 @@ $id: http://devicetree.org/schemas/iio/accel/adi,adis16201.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 -title: ADIS16201 Dual Axis Inclinometer and similar +title: ADIS16201 Inclinometer and similar =20 maintainers: - Jonathan Cameron =20 description: | - Two similar parts from external interface point of view. + Three similar parts from external interface point of view. SPI interface. https://www.analog.com/en/products/adis16201.html + https://www.analog.com/en/products/adis16203.html https://www.analog.com/en/products/adis16209.html =20 properties: compatible: enum: - adi,adis16201 + - adi,adis16203 - adi,adis16209 =20 reg: --=20 2.43.0