From patchwork Thu Feb 6 06:13:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 11367669 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25B8F1398 for ; Thu, 6 Feb 2020 06:24:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0435F20838 for ; Thu, 6 Feb 2020 06:24:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=konsulko.com header.i=@konsulko.com header.b="ry0YiSgg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727884AbgBFGYN (ORCPT ); Thu, 6 Feb 2020 01:24:13 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:35862 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725809AbgBFGYN (ORCPT ); Thu, 6 Feb 2020 01:24:13 -0500 Received: by mail-pf1-f194.google.com with SMTP id 185so2538115pfv.3 for ; Wed, 05 Feb 2020 22:24:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bNSyMZF9468DIDJcjhlMXesbT1C4yGPmOXHzox1YDqw=; b=ry0YiSgg3AUYCpxB9KezLDUQp9Nw7If3Cd2u3RMiGy4F4oW4nSfydbrNzG7Gjqq7iJ cJVvxq/Tq4ZIQAqjED5ceY3KCfy/y7sLKkncS41MYh3znfzDOoLlflZuCeFJ/8xbG/rQ K12pZb4+0m7XEraQvv4k+gAnmvQFPpUBMsDfs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bNSyMZF9468DIDJcjhlMXesbT1C4yGPmOXHzox1YDqw=; b=G3Gnsxy6Xr3TGdWcHbo0ZTzzVlHVczSQrIDAuvBXcPOaAnRJ9Th3bdEyJuV3nCTJCu nCpHM1vzztPw5IvrVAKf9DkHiM0bUML/VFzqLLvC2ozix5nCuIyDONfWtmBskNmW47Bv db+XsLM9c5mz4IydDmnEt7uPmGWIbpm6MU9uG61/lapPN04PUO2LT3D/E5X52cQXu6Ec bykX23mlQLg0ZwP21WFrci0LXB36dbSy52ZJpq/j9aQIcQ1Q/9UTvF8yJckY9WC3lQsA BCjYhMKo/io10UybbxGLDor4KM5L/PFtKCTzCfEH7sW4haj9edVvtGqQ6U+oFlbqR17N 1rDA== X-Gm-Message-State: APjAAAW8ZopORGnq2cTFG+Wt/xLSwrakgDNwdlLi0OWwUyal0IKwlaB3 0T+zdbEftVt7Omn4Rmz7dm1Tyxh00DmiaeAi X-Google-Smtp-Source: APXvYqwBRoKfdtuwWgJFoijSYU5IGUEva0hU4LwGujQDubaUkAPoHBTs6i2m5/u+9CcmHErnvh9YZQ== X-Received: by 2002:a63:220b:: with SMTP id i11mr1899661pgi.50.1580970252633; Wed, 05 Feb 2020 22:24:12 -0800 (PST) Received: from virtualbox.hsd1.wa.comcast.net (c-67-171-239-254.hsd1.wa.comcast.net. [67.171.239.254]) by smtp.gmail.com with ESMTPSA id z127sm1771323pgb.64.2020.02.05.22.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 22:24:12 -0800 (PST) From: Matt Ranostay To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, Matt Ranostay Subject: [PATCH v4 1/3] iio: chemical: atlas-sensor: allow probe without interrupt line Date: Wed, 5 Feb 2020 22:13:30 -0800 Message-Id: <20200206061332.20427-2-matt.ranostay@konsulko.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200206061332.20427-1-matt.ranostay@konsulko.com> References: <20200206061332.20427-1-matt.ranostay@konsulko.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Sensors don't actually need a interrupt line to give valid readings, and can triggered with CONFIG_IIO_HRTIMER_TRIGGER as well. Remove the required check for interrupt, and continue along in the probe function. Signed-off-by: Matt Ranostay --- drivers/iio/chemical/atlas-sensor.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c index 2f0a6fed2589..2e34c82cb65d 100644 --- a/drivers/iio/chemical/atlas-sensor.c +++ b/drivers/iio/chemical/atlas-sensor.c @@ -572,11 +572,6 @@ static int atlas_probe(struct i2c_client *client, if (ret) return ret; - if (client->irq <= 0) { - dev_err(&client->dev, "no valid irq defined\n"); - return -EINVAL; - } - ret = chip->calibration(data); if (ret) return ret; @@ -596,16 +591,18 @@ static int atlas_probe(struct i2c_client *client, init_irq_work(&data->work, atlas_work_handler); - /* interrupt pin toggles on new conversion */ - ret = devm_request_threaded_irq(&client->dev, client->irq, - NULL, atlas_interrupt_handler, - IRQF_TRIGGER_RISING | - IRQF_TRIGGER_FALLING | IRQF_ONESHOT, - "atlas_irq", - indio_dev); - if (ret) { - dev_err(&client->dev, "request irq (%d) failed\n", client->irq); - goto unregister_buffer; + if (client->irq <= 0) { + /* interrupt pin toggles on new conversion */ + ret = devm_request_threaded_irq(&client->dev, client->irq, + NULL, atlas_interrupt_handler, + IRQF_TRIGGER_RISING | + IRQF_TRIGGER_FALLING | IRQF_ONESHOT, + "atlas_irq", + indio_dev); + + if (ret) + dev_warn(&client->dev, + "request irq (%d) failed\n", client->irq); } ret = atlas_set_powermode(data, 1); From patchwork Thu Feb 6 06:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 11367673 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A952B14E3 for ; Thu, 6 Feb 2020 06:24:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87B21218AC for ; Thu, 6 Feb 2020 06:24:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=konsulko.com header.i=@konsulko.com header.b="SdZTrAMp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727885AbgBFGYP (ORCPT ); Thu, 6 Feb 2020 01:24:15 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:33658 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727860AbgBFGYP (ORCPT ); Thu, 6 Feb 2020 01:24:15 -0500 Received: by mail-pj1-f66.google.com with SMTP id m7so83498pjs.0 for ; Wed, 05 Feb 2020 22:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9an7fiwpJoV9YjTyVejbkq6+w6Nj3B8gpVIV6VF2yoc=; b=SdZTrAMpDnf4bj/23Pcqnmq+QfPI52I/RjxK+LUKpFP7S88ARzxnJIx/ao0TjzbySH apMiDQMInXz7GTxqdeM2EmANHsyiNl7F9lTyno9Rjac+Hn8J9nyt/B958twhnlGurbS1 Mxp3n8VqL1tD3jA8I2b769pzLEWweNH8Y/1h8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9an7fiwpJoV9YjTyVejbkq6+w6Nj3B8gpVIV6VF2yoc=; b=mJUq0ffay4nMcnCMg8cGCIYWsNy55M0dMb9LCr14TkHpYp6WK2ZpWj/M8nV3tIjb76 LFyZlvd8oC6Tsc3UEcJvszcos4hfIxqozReHui9S9nd2rr4XezZS8YhvMHM9syH+5ewo nADxtxJlXYBUybQZRWMumPReWJnCYC0H3beVEycCvn23NeEbNiNxXVoKYjfEXhsIJcEr my6JmI5Y+irki4tDQY66cBMnqQ/hIJrac2T+nlPFwzTN+ihgSx38BrizNIUT6o5rPUKK 3My+fYLbOoPpkjUa0peurkWtNjLvh79jpcEeLa7iIJtnOfwHHzoXtH18ZlONfZC0oU1K pB9A== X-Gm-Message-State: APjAAAVbRoXLclxXO3YvfMPrMWHAFCCZRqi4JdwfALzQgp64dEy8qejP tIULgRnYjRYMqHq4ZXqXSJ6faD7fWqz9B9ie X-Google-Smtp-Source: APXvYqyER2Wt3IErVnN3hQPLS2MvdmlsJOcEb4aU+UTatbWhc2ZAJ2BtGiVOAZGQDHCkbGwNHD8s3g== X-Received: by 2002:a17:902:b210:: with SMTP id t16mr2081491plr.65.1580970253773; Wed, 05 Feb 2020 22:24:13 -0800 (PST) Received: from virtualbox.hsd1.wa.comcast.net (c-67-171-239-254.hsd1.wa.comcast.net. [67.171.239.254]) by smtp.gmail.com with ESMTPSA id z127sm1771323pgb.64.2020.02.05.22.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 22:24:13 -0800 (PST) From: Matt Ranostay To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, Matt Ranostay Subject: [PATCH v4 2/3] iio: chemical: atlas-sensor: add DO-SM module support Date: Wed, 5 Feb 2020 22:13:31 -0800 Message-Id: <20200206061332.20427-3-matt.ranostay@konsulko.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200206061332.20427-1-matt.ranostay@konsulko.com> References: <20200206061332.20427-1-matt.ranostay@konsulko.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Atlas Scientific DO-SM OEM sensor reads disolved oxygen in a solution. This is reported back as mg/L which maps direc to ppm and so the IIO_CONCENTRATION channel type can be used. Signed-off-by: Matt Ranostay --- drivers/iio/chemical/atlas-sensor.c | 64 +++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c index 2e34c82cb65d..919d408869be 100644 --- a/drivers/iio/chemical/atlas-sensor.c +++ b/drivers/iio/chemical/atlas-sensor.c @@ -48,6 +48,11 @@ #define ATLAS_REG_EC_CALIB_STATUS_LOW BIT(2) #define ATLAS_REG_EC_CALIB_STATUS_HIGH BIT(3) +#define ATLAS_REG_DO_CALIB_STATUS 0x09 +#define ATLAS_REG_DO_CALIB_STATUS_MASK 0x03 +#define ATLAS_REG_DO_CALIB_STATUS_PRESSURE BIT(0) +#define ATLAS_REG_DO_CALIB_STATUS_DO BIT(1) + #define ATLAS_REG_PH_TEMP_DATA 0x0e #define ATLAS_REG_PH_DATA 0x16 @@ -60,14 +65,19 @@ #define ATLAS_REG_ORP_CALIB_STATUS 0x0d #define ATLAS_REG_ORP_DATA 0x0e +#define ATLAS_REG_DO_TEMP_DATA 0x12 +#define ATLAS_REG_DO_DATA 0x22 + #define ATLAS_PH_INT_TIME_IN_MS 450 #define ATLAS_EC_INT_TIME_IN_MS 650 #define ATLAS_ORP_INT_TIME_IN_MS 450 +#define ATLAS_DO_INT_TIME_IN_MS 450 enum { ATLAS_PH_SM, ATLAS_EC_SM, ATLAS_ORP_SM, + ATLAS_DO_SM, }; struct atlas_data { @@ -121,7 +131,7 @@ static const struct iio_chan_spec atlas_ph_channels[] = { }, }; -#define ATLAS_EC_CHANNEL(_idx, _addr) \ +#define ATLAS_CONCENTRATION_CHANNEL(_idx, _addr) \ {\ .type = IIO_CONCENTRATION, \ .indexed = 1, \ @@ -152,8 +162,8 @@ static const struct iio_chan_spec atlas_ec_channels[] = { .endianness = IIO_BE, }, }, - ATLAS_EC_CHANNEL(0, ATLAS_REG_TDS_DATA), - ATLAS_EC_CHANNEL(1, ATLAS_REG_PSS_DATA), + ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_TDS_DATA), + ATLAS_CONCENTRATION_CHANNEL(1, ATLAS_REG_PSS_DATA), IIO_CHAN_SOFT_TIMESTAMP(3), { .type = IIO_TEMP, @@ -182,6 +192,19 @@ static const struct iio_chan_spec atlas_orp_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(1), }; +static const struct iio_chan_spec atlas_do_channels[] = { + ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA), + IIO_CHAN_SOFT_TIMESTAMP(1), + { + .type = IIO_TEMP, + .address = ATLAS_REG_DO_TEMP_DATA, + .info_mask_separate = + BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .output = 1, + .scan_index = -1 + }, +}; + static int atlas_check_ph_calibration(struct atlas_data *data) { struct device *dev = &data->client->dev; @@ -262,7 +285,31 @@ static int atlas_check_orp_calibration(struct atlas_data *data) dev_warn(dev, "device has not been calibrated\n"); return 0; -}; +} + +static int atlas_check_do_calibration(struct atlas_data *data) +{ + struct device *dev = &data->client->dev; + int ret; + unsigned int val; + + ret = regmap_read(data->regmap, ATLAS_REG_DO_CALIB_STATUS, &val); + if (ret) + return ret; + + if (!(val & ATLAS_REG_DO_CALIB_STATUS_MASK)) { + dev_warn(dev, "device has not been calibrated\n"); + return 0; + } + + if (!(val & ATLAS_REG_DO_CALIB_STATUS_PRESSURE)) + dev_warn(dev, "device missing atmospheric pressure calibration\n"); + + if (!(val & ATLAS_REG_DO_CALIB_STATUS_DO)) + dev_warn(dev, "device missing dissolved oxygen calibration\n"); + + return 0; +} struct atlas_device { const struct iio_chan_spec *channels; @@ -295,6 +342,13 @@ static struct atlas_device atlas_devices[] = { .calibration = &atlas_check_orp_calibration, .delay = ATLAS_ORP_INT_TIME_IN_MS, }, + [ATLAS_DO_SM] = { + .channels = atlas_do_channels, + .num_channels = 3, + .data_reg = ATLAS_REG_DO_DATA, + .calibration = &atlas_check_do_calibration, + .delay = ATLAS_DO_INT_TIME_IN_MS, + }, }; static int atlas_set_powermode(struct atlas_data *data, int on) @@ -507,6 +561,7 @@ static const struct i2c_device_id atlas_id[] = { { "atlas-ph-sm", ATLAS_PH_SM}, { "atlas-ec-sm", ATLAS_EC_SM}, { "atlas-orp-sm", ATLAS_ORP_SM}, + { "atlas-do-sm", ATLAS_DO_SM}, {} }; MODULE_DEVICE_TABLE(i2c, atlas_id); @@ -515,6 +570,7 @@ static const struct of_device_id atlas_dt_ids[] = { { .compatible = "atlas,ph-sm", .data = (void *)ATLAS_PH_SM, }, { .compatible = "atlas,ec-sm", .data = (void *)ATLAS_EC_SM, }, { .compatible = "atlas,orp-sm", .data = (void *)ATLAS_ORP_SM, }, + { .compatible = "atlas,do-sm", .data = (void *)ATLAS_DO_SM, }, { } }; MODULE_DEVICE_TABLE(of, atlas_dt_ids); From patchwork Thu Feb 6 06:13:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 11367675 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C1C21398 for ; Thu, 6 Feb 2020 06:24:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D558B20838 for ; Thu, 6 Feb 2020 06:24:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=konsulko.com header.i=@konsulko.com header.b="q2VHUClJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725809AbgBFGYQ (ORCPT ); Thu, 6 Feb 2020 01:24:16 -0500 Received: from mail-pf1-f181.google.com ([209.85.210.181]:38814 "EHLO mail-pf1-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727860AbgBFGYQ (ORCPT ); Thu, 6 Feb 2020 01:24:16 -0500 Received: by mail-pf1-f181.google.com with SMTP id x185so2534484pfc.5 for ; Wed, 05 Feb 2020 22:24:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=izztQoaxTfYh608r7zUZBOPeN+NzswpzW45W6rctyos=; b=q2VHUClJwtxwoLcuIMbaSeogVD0FHsqoPIsjw1lNHdRKeKPkhkf/H3p9Gp6zUSh2Sp Rd0I9eY2Ffl0iWEecgJCq9lLSE9Kjth0JO/0zdN0Fa+nUK4y0lecWVVJQeMCdjJm5Lj3 Ia8BTLRccs8w4Hh2EMtfV/ltV6JiIHLnuM/PQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=izztQoaxTfYh608r7zUZBOPeN+NzswpzW45W6rctyos=; b=kTTNkP2SWRqKIOkCleXs1K6ohzAfEcvXvoTPovs07omzCKQgy7vnHeKZCDs5DM7w9I hjgN0j7i/S9QFIO4ftfvTQ+CqEKt/4UEH7bvlRFJqSpQyTN5hiF01ISPST3So4AEWQ/A qfsO8vQIoHYN6xQNFjIGaBF+FqDTyMSPE02d5VZkX25GcNo8AERl4yZFXv1Uy5T1oM6U mBQ0srkbQOQH0UdIwo4CfDvyZ1Kw4mFbZa8I4YUmBSsaKkV7hUWNeaLtKpne6rcV30ne R8rnkYGiIYuPnnESat/Uu+iv2v0hfSC1tAACqGCfnMSc6hAGN1Qu+YWAFOC1JR8oDOt+ zTOw== X-Gm-Message-State: APjAAAWYFdzHBHwbAzdLLE2fTddAwO0Fa99lmZgc5gKNbqQv6Wlc4cdp L4NDpto8eXVfFRTCsNmlhLsNy06iDkbIY/PB X-Google-Smtp-Source: APXvYqw/vp5LNrRJt/Q+qLAv0gBC5SH+qxAyPYIF93LDaSu/2mohDSBDzGKy6o1Kvmhv0Vwzc6QljA== X-Received: by 2002:aa7:8149:: with SMTP id d9mr2065758pfn.170.1580970254829; Wed, 05 Feb 2020 22:24:14 -0800 (PST) Received: from virtualbox.hsd1.wa.comcast.net (c-67-171-239-254.hsd1.wa.comcast.net. [67.171.239.254]) by smtp.gmail.com with ESMTPSA id z127sm1771323pgb.64.2020.02.05.22.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 22:24:14 -0800 (PST) From: Matt Ranostay To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, Matt Ranostay , devicetree@vger.kernel.org Subject: [PATCH v4 3/3] dt-bindings: iio: chemical: consolidate atlas-sensor docs Date: Wed, 5 Feb 2020 22:13:32 -0800 Message-Id: <20200206061332.20427-4-matt.ranostay@konsulko.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200206061332.20427-1-matt.ranostay@konsulko.com> References: <20200206061332.20427-1-matt.ranostay@konsulko.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Since Atlas Scientific device support only varies from the compatible string is ideal all the respective docs are merged into a single doc named atlas,sensor.yaml Cc: devicetree@vger.kernel.org Signed-off-by: Matt Ranostay Reviewed-by: Rob Herring --- .../bindings/iio/chemical/atlas,ec-sm.txt | 21 -------- .../bindings/iio/chemical/atlas,orp-sm.txt | 21 -------- .../bindings/iio/chemical/atlas,ph-sm.txt | 21 -------- .../bindings/iio/chemical/atlas,sensor.yaml | 53 +++++++++++++++++++ 4 files changed, 53 insertions(+), 63 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt delete mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt deleted file mode 100644 index f4320595b851..000000000000 --- a/Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt +++ /dev/null @@ -1,21 +0,0 @@ -* Atlas Scientific EC-SM OEM sensor - -http://www.atlas-scientific.com/_files/_datasheets/_oem/EC_oem_datasheet.pdf - -Required properties: - - - compatible: must be "atlas,ec-sm" - - reg: the I2C address of the sensor - - interrupts: the sole interrupt generated by the device - - Refer to interrupt-controller/interrupts.txt for generic interrupt client - node bindings. - -Example: - -atlas@64 { - compatible = "atlas,ec-sm"; - reg = <0x64>; - interrupt-parent = <&gpio1>; - interrupts = <16 2>; -}; diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt deleted file mode 100644 index af1f5a9aa4da..000000000000 --- a/Documentation/devicetree/bindings/iio/chemical/atlas,orp-sm.txt +++ /dev/null @@ -1,21 +0,0 @@ -* Atlas Scientific ORP-SM OEM sensor - -https://www.atlas-scientific.com/_files/_datasheets/_oem/ORP_oem_datasheet.pdf - -Required properties: - - - compatible: must be "atlas,orp-sm" - - reg: the I2C address of the sensor - - interrupts: the sole interrupt generated by the device - - Refer to interrupt-controller/interrupts.txt for generic interrupt client - node bindings. - -Example: - -atlas@66 { - compatible = "atlas,orp-sm"; - reg = <0x66>; - interrupt-parent = <&gpio1>; - interrupts = <16 2>; -}; diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt b/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt deleted file mode 100644 index 79d90f060327..000000000000 --- a/Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt +++ /dev/null @@ -1,21 +0,0 @@ -* Atlas Scientific pH-SM OEM sensor - -http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf - -Required properties: - - - compatible: must be "atlas,ph-sm" - - reg: the I2C address of the sensor - - interrupts: the sole interrupt generated by the device - - Refer to interrupt-controller/interrupts.txt for generic interrupt client - node bindings. - -Example: - -atlas@65 { - compatible = "atlas,ph-sm"; - reg = <0x65>; - interrupt-parent = <&gpio1>; - interrupts = <16 2>; -}; diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml new file mode 100644 index 000000000000..1b0c476838d1 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/chemical/atlas,sensor.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Atlas Scientific OEM sensors + +maintainers: + - Matt Ranostay + +description: | + Atlas Scientific OEM sensors connected via I2C + + Datasheets: + http://www.atlas-scientific.com/_files/_datasheets/_oem/DO_oem_datasheet.pdf + http://www.atlas-scientific.com/_files/_datasheets/_oem/EC_oem_datasheet.pdf + http://www.atlas-scientific.com/_files/_datasheets/_oem/ORP_oem_datasheet.pdf + http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf + +properties: + compatible: + enum: + - atlas,do-sm + - atlas,ec-sm + - atlas,orp-sm + - atlas,ph-sm + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + atlas@66 { + compatible = "atlas,orp-sm"; + reg = <0x66>; + interrupt-parent = <&gpio1>; + interrupts = <16 2>; + }; + };