From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 54F0B39891D for ; Sat, 13 Jun 2026 19:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781377840; cv=none; b=Nzqf1J9PBpkokotNeyCHLeJ9AMtfKW4EwgArZUWzmMKsfNOSevsPkYNueWlx9h7ZSsu6FZQUmJ9SAuAlKvSqsdBdoLQy3KtYp9xz7l+s8j/qWzXGV1qjgmntRBhZgbCxgPkRlhqOzwflVkUqdfYRXZ9OONCWpUp+2cUMZZpXYtA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781377840; c=relaxed/simple; bh=/ATcjgQBg4PKaQAKJoJ+QyJHoBhwM3d25iuyZbX1jKE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P4zdIg+FIeNxSgfde2ShaRCVJpY09VzMy2ToajcHB2n3plvY6zzKXzNEDKI6PR9hb9LZ86CK0ZElxlqjq+Es4WP5S6Ico4DJt+No4Qy+p3tZZimQs9ID0cH8LzdXOqazpC/4RA/1n9baAitjqXPTZ1Yd8hfDbaop9xqLVcv3GKA= 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=UUyjg8N9; arc=none smtp.client-ip=209.85.218.51 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="UUyjg8N9" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-bebb72b845aso345342766b.3 for ; Sat, 13 Jun 2026 12:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781377837; x=1781982637; 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=YI/dslK6AvANzEH96zaO8Q+P15bLXwMMeUyI+PCap/M=; b=UUyjg8N9k9KaovYFY3vaBVbF4e3QD1ibqFkfaKYvpLHhDtm84JQLdWGWI5XxzoYXo8 m7NL5+dyYQOHsqCI7XUBPevWPtJRmcpJDnqQ1byNMkv2cqYVj7x+ZtwepWhThXOfwmLs AS0dndpaOTPDoKsJIA23Pw7WEeUkNyUycqy2vUbknhdCN0Q7DeXQoEdL83t8rTbmkCJo xiOax2fnrsZxFZp9Md033AGIhqx6OuW0Yj1nS7H48/XBD1PXhax1OCf4PdCuiFy8Dv5I k0u7YNJM3ZjC4rx0eey36NgZ2CzsCGI+gEOURVntCnoNU8d8iKfqDg/sHbrHW5ZHhWoK Maig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781377837; x=1781982637; 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; bh=YI/dslK6AvANzEH96zaO8Q+P15bLXwMMeUyI+PCap/M=; b=NOIdfoWhQCLo77xNAwKIfC+3yqpd41foHBgxWFU969SFvXE1AmRhzaPoanvMG4BXuk Q7rt7PJtpvq/nb0MGni09IhQpeEF4PcK2R9ObC/8dbfUrObcjtbnIKnFSBxDf34uXLmg W2eYUD5sN3ojTL2X7vMPADAR5ruinBOQ64Q7l83MxaZy2FMNgYdRL5LqAnl4erh3wxb9 mwzolFWgDDm17YkItLYPyv6U0SU+Hc4+PPh3+o4S6pcFAsYHjWaJ6lxUbywC15bJ7P7m +Klt9gyTT4kI+FR6M8vah+bTVR3tLo0i6r4SWmu6m1Y+y2sQJtakV+o/r71W26t9I1sy UUxg== X-Forwarded-Encrypted: i=1; AFNElJ8qhW09OBY3X6w4zY7gskG0zh+o993v7Ps1l748TaIsHzn7+NpVdNM0tDKhuNpWxdTr19NKnpCjyLvT6sk=@vger.kernel.org X-Gm-Message-State: AOJu0YwR3FBRGJg+4/vMZ2fgs5ulcO58jiTMXqKCydofyYyhpEJLjcX2 Qdetok6ZQxObkk9B9m2D1zg55lUOOAH6DGWVd7KCxLWURTIRACX+Vm+X X-Gm-Gg: Acq92OEw/IOYjXpDIoDOmNkGymbYDVwIqAEzyQAot3Yfg2XBNvcfxIt2tq7NkDtk5li wK/6///3HeZSbqNYp1CDYKb67ux9+/yruFgsiuxQvJgpmH+Zrtg9sj8kY6iDW+2p1kGPJdeJQaf 2gBuz5lgrKaF52XadqH3HURXiYhVLJ4B9iPYt2hkUDLNtnQKHkZedZVUOByIGYSVPgYpZzsJ7Zl 0LQXN4UC10hfVJ1mkglFGF4RC//gTACaGGmUrb78Jiqxhb1nwSztrJ05r3Nsf2pmkfxfEPsBJOh Hoq1JTpRerwaaq2RtRseUdq7ICVUoYjfOGgqkZG02T9eC0uleycPmBtSfDayq5eyB3T+gzvqgeJ WdM7EuT8toeEqA4NaUUvrYMtP89+L2T1x3PugZScxlaXc2rrrz/a7t5LJl2T7geKv9Bd15xa2EB dZcShc+i4U980DcJHat3To8NUaF1YNuQwmswY0Ol4/x8fSxtTIXA19HUNjFg== X-Received: by 2002:a17:907:7285:b0:bee:aed6:9d50 with SMTP id a640c23a62f3a-bfe2bfa08a5mr337807066b.48.1781377836530; Sat, 13 Jun 2026 12:10:36 -0700 (PDT) Received: from MSI-LINUX.kielce.vectranet.pl ([2a02:2a40:27ec:2900:9790:7740:8855:4d8c]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bfdb4b2276fsm237193366b.17.2026.06.13.12.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2026 12:10:35 -0700 (PDT) From: Jakub Szczudlo To: linux-iio@vger.kernel.org Cc: andy@kernel.org, antoniu.miclaus@analog.com, conor+dt@kernel.org, devicetree@vger.kernel.org, dlechner@baylibre.com, duje@dujemihanovic.xyz, jic23@kernel.org, jishnu.prakash@oss.qualcomm.com, jorge.marques@analog.com, krzk+dt@kernel.org, linusw@kernel.org, linux-kernel@vger.kernel.org, marcelo.schmitt@analog.com, mazziesaccount@gmail.com, mike.looijmans@topic.nl, nuno.sa@analog.com, robh@kernel.org, sakari.ailus@linux.intel.com, wens@kernel.org, joshua.crofts1@gmail.com, Jakub Szczudlo Subject: [PATCH v3 2/3] iio: adc: Add ti-ads1110 support to ti-ads1100 driver Date: Sat, 13 Jun 2026 21:09:56 +0200 Message-ID: <20260613190957.654798-3-jakubszczudlo40@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260613190957.654798-1-jakubszczudlo40@gmail.com> References: <20260613190957.654798-1-jakubszczudlo40@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: 8bit Add ADS1110 support that have faster datarate than ADS1100, it also uses internal voltage reference of 2.048V for measurement. Signed-off-by: Jakub Szczudlo --- drivers/iio/adc/Kconfig | 6 +-- drivers/iio/adc/ti-ads1100.c | 83 +++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 24 deletions(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index a9dedbb8eb46..54a0149a3838 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -1747,11 +1747,11 @@ config TI_ADS1018 called ti-ads1018. config TI_ADS1100 - tristate "Texas Instruments ADS1100 and ADS1000 ADC" + tristate "Texas Instruments ADS1100 and similar single channel I2C ADC" depends on I2C help - If you say yes here you get support for Texas Instruments ADS1100 and - ADS1000 ADC chips. + If you say yes here you get support TI ADS1100 and similar single + channel I2C Analog to Digital Converters This driver can also be built as a module. If so, the module will be called ti-ads1100. diff --git a/drivers/iio/adc/ti-ads1100.c b/drivers/iio/adc/ti-ads1100.c index aa8946063c7d..76de2466dc53 100644 --- a/drivers/iio/adc/ti-ads1100.c +++ b/drivers/iio/adc/ti-ads1100.c @@ -5,7 +5,7 @@ * Copyright (c) 2023, Topic Embedded Products * * Datasheet: https://www.ti.com/lit/gpn/ads1100 - * IIO driver for ADS1100 and ADS1000 ADC 16-bit I2C + * IIO driver for ADS1100 and similar single channel ADC 16-bit I2C */ #include @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -39,17 +40,41 @@ #define ADS1100_SINGLESHOT ADS1100_CFG_SC #define ADS1100_SLEEP_DELAY_MS 2000 +#define ADS1110_REFERENCE_VOLTAGE_MILIVOLTS 2048 + +/* Timeout based on the minimum sample rate of 8 SPS (7500000us) */ +#define ADS1100_MAX_DRDY_TIMEOUT 7500000 static const int ads1100_data_rate[] = { 128, 32, 16, 8 }; +static const int ads1110_data_rate[] = { 240, 60, 30, 15 }; static const int ads1100_data_rate_bits[] = { 12, 14, 15, 16 }; +struct ads1100_config { + const char *name; + const int *data_rate; + bool has_reference_voltage; +}; + +static const struct ads1100_config ads1100_config = { + .name = "ads1100", + .data_rate = ads1100_data_rate, + .has_reference_voltage = false, +}; + +static const struct ads1100_config ads1110_config = { + .name = "ads1110", + .data_rate = ads1110_data_rate, + .has_reference_voltage = true, +}; + struct ads1100_data { struct i2c_client *client; struct regulator *reg_vdd; struct mutex lock; int scale_avail[2 * 4]; /* 4 gain settings */ + struct ads1100_config *ads_config; u8 config; - bool supports_data_rate; /* Only the ADS1100 can select the rate */ + bool supports_data_rate; /* Only the ADS1100/ADS1110 can select the rate */ }; static const struct iio_chan_spec ads1100_channel = { @@ -85,6 +110,19 @@ static int ads1100_set_config_bits(struct ads1100_data *data, u8 mask, u8 value) return 0; }; +static int ads1100_get_voltage_milivolts(struct ads1100_data *data) +{ + if (data->ads_config->has_reference_voltage) + return ADS1110_REFERENCE_VOLTAGE_MILIVOLTS; + else + return regulator_get_voltage(data->reg_vdd) / MILLI; +} + +static int ads1100_get_voltage_microvolts(struct ads1100_data *data) +{ + return ads1100_get_voltage_milivolts(data) * MICRO / MILLI; +} + static int ads1100_data_bits(struct ads1100_data *data) { return ads1100_data_rate_bits[FIELD_GET(ADS1100_DR_MASK, data->config)]; @@ -107,9 +145,9 @@ static int ads1100_get_adc_result(struct ads1100_data *data, int chan, int *val) pm_runtime_put_autosuspend(&data->client->dev); - if (ret < 0) { + if (ret < 2) { dev_err(&data->client->dev, "I2C read fail: %d\n", ret); - return ret; + return -EIO; } /* Value is always 16-bit 2's complement */ @@ -135,7 +173,7 @@ static int ads1100_set_scale(struct ads1100_data *data, int val, int val2) if (!val2) return -EINVAL; - microvolts = regulator_get_voltage(data->reg_vdd); + microvolts = ads1100_get_voltage_microvolts(data); /* * val2 is in 'micro' units, n = val2 / 1000000 * result must be millivolts, d = microvolts / 1000 @@ -159,22 +197,17 @@ static int ads1100_set_data_rate(struct ads1100_data *data, int chan, int rate) size = data->supports_data_rate ? ARRAY_SIZE(ads1100_data_rate) : 1; for (i = 0; i < size; i++) { - if (ads1100_data_rate[i] == rate) + if (data->ads_config->data_rate[i] == rate) return ads1100_set_config_bits(data, ADS1100_DR_MASK, - FIELD_PREP(ADS1100_DR_MASK, i)); + FIELD_PREP(ADS1100_DR_MASK, i)); } return -EINVAL; } -static int ads1100_get_vdd_millivolts(struct ads1100_data *data) -{ - return regulator_get_voltage(data->reg_vdd) / (MICRO / MILLI); -} - static void ads1100_calc_scale_avail(struct ads1100_data *data) { - int millivolts = ads1100_get_vdd_millivolts(data); + int millivolts = ads1100_get_voltage_milivolts(data); unsigned int i; for (i = 0; i < ARRAY_SIZE(data->scale_avail) / 2; i++) { @@ -196,7 +229,7 @@ static int ads1100_read_avail(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: *type = IIO_VAL_INT; - *vals = ads1100_data_rate; + *vals = data->ads_config->data_rate; if (data->supports_data_rate) *length = ARRAY_SIZE(ads1100_data_rate); else @@ -233,12 +266,11 @@ static int ads1100_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: /* full-scale is the supply voltage in millivolts */ - *val = ads1100_get_vdd_millivolts(data); + *val = ads1100_get_voltage_milivolts(data); *val2 = 15 + FIELD_GET(ADS1100_PGA_MASK, data->config); return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_SAMP_FREQ: - *val = ads1100_data_rate[FIELD_GET(ADS1100_DR_MASK, - data->config)]; + *val = data->ads_config->data_rate[FIELD_GET(ADS1100_DR_MASK, data->config)]; return IIO_VAL_INT; default: return -EINVAL; @@ -307,6 +339,7 @@ static int ads1100_probe(struct i2c_client *client) struct iio_dev *indio_dev; struct ads1100_data *data; struct device *dev = &client->dev; + const struct ads1100_config *model; int ret; indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); @@ -338,6 +371,12 @@ static int ads1100_probe(struct i2c_client *client) if (ret) return ret; + model = device_get_match_data(dev); + if (!model) + return dev_err_probe(dev, -EINVAL, + "Can't get device data from firmware\n"); + + data->ads_config = (struct ads1100_config *)model; ret = ads1100_setup(data); if (ret) return dev_err_probe(dev, ret, @@ -400,16 +439,18 @@ static DEFINE_RUNTIME_DEV_PM_OPS(ads1100_pm_ops, NULL); static const struct i2c_device_id ads1100_id[] = { - { "ads1100" }, - { "ads1000" }, + { .name = "ads1000", .driver_data = (kernel_ulong_t)&ads1100_config }, + { .name = "ads1100", .driver_data = (kernel_ulong_t)&ads1100_config }, + { .name = "ads1110", .driver_data = (kernel_ulong_t)&ads1110_config }, { } }; MODULE_DEVICE_TABLE(i2c, ads1100_id); static const struct of_device_id ads1100_of_match[] = { - {.compatible = "ti,ads1100" }, - {.compatible = "ti,ads1000" }, + { .compatible = "ti,ads1000", .data = &ads1100_config }, + { .compatible = "ti,ads1100", .data = &ads1100_config }, + { .compatible = "ti,ads1110", .data = &ads1110_config }, { } }; -- 2.47.3