From patchwork Thu Sep 10 18:04:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Malpani X-Patchwork-Id: 11768553 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 7C34659D for ; Thu, 10 Sep 2020 18:07:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40754221E2 for ; Thu, 10 Sep 2020 18:07:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ci4PsvgO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbgIJSHd (ORCPT ); Thu, 10 Sep 2020 14:07:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726005AbgIJSFi (ORCPT ); Thu, 10 Sep 2020 14:05:38 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C84D4C061573; Thu, 10 Sep 2020 11:05:37 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id fa1so408745pjb.0; Thu, 10 Sep 2020 11:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kd6D3uOy+jWlK6YqamPAaqgBI+aBqWSwpEiEKk4pSmI=; b=ci4PsvgOGRWYc5gDc7IsoJv5Ssd7WO8Ny5/z1R1wfuTwBkpRJ6eD2vmLkBBbJ8yTQ1 rP0lDYsKt/WeLbM4JY6u9/hUTu9X+GIXVeDV4V65Zvik/WGJRcJZcADRa3locHlM1CVV 0JkDh0zNqQ7CLvHHgQR3AbxXJjXE0BzwI9wED1OHWGG23dCcpLxWokq0K+JmJ2yLraGX Dj7CONaLN3YRHHGCgOjy5FiAec+plfot/7y9TVEEf1e5e7zPj3k3M5MsU5RhxDTkdtrn PFMF7Z30r7CpAnvtXrXirdyzM7KObZfx08+gNpTr5xsQ2qJchSgUvSQ2gisCwZTIdqlR 7kYg== 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=kd6D3uOy+jWlK6YqamPAaqgBI+aBqWSwpEiEKk4pSmI=; b=d9sRrdwPp2M28/UndYjwys80nQP3Br5tKeA24jz7kvGPUmrNYj8Z6KHeanUu+dxl8w /visBJLMbdWaF6MTEH4+w6Df8SWkb6IH3NOV8rTa3EKNAKgITf/4V/jzTfX7DQ+zff2v 97lRxQM+vTsc1OFlgBLC2dWOOAtUZnXD5DNcedcNDg9X7qgtDPERVtC2Xy49LxGc3Uj3 r0pHUwrHmVAUDPDVwc0DlofRDVNZOaY84luqil2+7ckB8KNaBAS4C9e5hEapxfgipYeo 4KgcRDFg7i24iM4WOAi7GPZh6HSYm/alOWpU2SoGFBs2juRBN6q93ghaH9eSBd+C3O2Y 4yKw== X-Gm-Message-State: AOAM5306ECVJ/gQukUsZy2UDWrAas/wh3R8UusHv8Pn7idqUlDSKBj/V yD5uCFmFjrSxx4P7I71g9Fg= X-Google-Smtp-Source: ABdhPJyAyC86VQCA8McduutXmW4rPyX/fPsDcgKFftyKlBFFJ3xPMpX7v9v/X9N3CvCBLYDnCX1Vww== X-Received: by 2002:a17:90a:ce95:: with SMTP id g21mr1041659pju.175.1599761137269; Thu, 10 Sep 2020 11:05:37 -0700 (PDT) Received: from nish-HP-Pavilion ([2409:4072:6218:54d7:9928:e984:12bb:783d]) by smtp.gmail.com with ESMTPSA id n12sm5702532pgk.20.2020.09.10.11.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 11:05:36 -0700 (PDT) From: Nishant Malpani To: jic23@kernel.org, robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, andy.shevchenko@gmail.com, Nishant Malpani Subject: [RESEND PATCH v3 1/3] iio: gyro: adxrs290: Add triggered buffer support Date: Thu, 10 Sep 2020 23:34:48 +0530 Message-Id: <20200910180450.29696-2-nish.malpani25@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910180450.29696-1-nish.malpani25@gmail.com> References: <20200910180450.29696-1-nish.malpani25@gmail.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Provide a way for continuous data capture by setting up buffer support. The data ready signal exposed at the SYNC pin of the ADXRS290 is exploited as a hardware interrupt which triggers to fill the buffer. Triggered buffer setup was tested with both hardware trigger (DATA_RDY) and software triggers (sysfs-trig & hrtimer). Reviewed-by: Andy Shevchenko Signed-off-by: Nishant Malpani --- Changes in v3: - issue a separate precursor patch for the devm resource unwinding hook - rename labels in the error-path - use dev_err_probe() (which handles deferred probing) only for calls which request h/w resources Changes in v2: - In adxrs290_set_mode(), move 'if' block outside the locked section - use break statement for error handling instead of goto labels in switch-case blocks - remove outer parentheses when conditional ternary operator is used - use dev_err_probe() saving a few lines of code - re-align 'buffer' variable name in 'struct adxrs290_state' - don't return errors in 'try_reenable' callback - use 'st->spi' inline in 'adxrs290_trigger_handler' - unnecessary to mention default 'shift' (= 0) in iio_chan_spec.scan_type - bring in consistent wrapping of parameters while staying under the advised 80 chars line limit --- drivers/iio/gyro/Kconfig | 2 + drivers/iio/gyro/adxrs290.c | 211 +++++++++++++++++++++++++++++++++--- 2 files changed, 199 insertions(+), 14 deletions(-) diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig index 024a34139875..5824f2edf975 100644 --- a/drivers/iio/gyro/Kconfig +++ b/drivers/iio/gyro/Kconfig @@ -44,6 +44,8 @@ config ADIS16260 config ADXRS290 tristate "Analog Devices ADXRS290 Dual-Axis MEMS Gyroscope SPI driver" depends on SPI + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Analog Devices ADXRS290 programmable digital output gyroscope. diff --git a/drivers/iio/gyro/adxrs290.c b/drivers/iio/gyro/adxrs290.c index 2864eb443957..41b1f995a143 100644 --- a/drivers/iio/gyro/adxrs290.c +++ b/drivers/iio/gyro/adxrs290.c @@ -13,8 +13,12 @@ #include #include +#include #include #include +#include +#include +#include #define ADXRS290_ADI_ID 0xAD #define ADXRS290_MEMS_ID 0x1D @@ -35,7 +39,9 @@ #define ADXRS290_READ BIT(7) #define ADXRS290_TSM BIT(0) #define ADXRS290_MEASUREMENT BIT(1) -#define ADXRS290_SYNC GENMASK(1, 0) +#define ADXRS290_DATA_RDY_OUT BIT(0) +#define ADXRS290_SYNC_MASK GENMASK(1, 0) +#define ADXRS290_SYNC(x) FIELD_PREP(ADXRS290_SYNC_MASK, x) #define ADXRS290_LPF_MASK GENMASK(2, 0) #define ADXRS290_LPF(x) FIELD_PREP(ADXRS290_LPF_MASK, x) #define ADXRS290_HPF_MASK GENMASK(7, 4) @@ -50,6 +56,13 @@ enum adxrs290_mode { ADXRS290_MODE_MEASUREMENT, }; +enum adxrs290_scan_index { + ADXRS290_IDX_X, + ADXRS290_IDX_Y, + ADXRS290_IDX_TEMP, + ADXRS290_IDX_TS, +}; + struct adxrs290_state { struct spi_device *spi; /* Serialize reads and their subsequent processing */ @@ -57,6 +70,12 @@ struct adxrs290_state { enum adxrs290_mode mode; unsigned int lpf_3db_freq_idx; unsigned int hpf_3db_freq_idx; + struct iio_trigger *dready_trig; + /* Ensure correct alignment of timestamp when present */ + struct { + s16 channels[3]; + s64 ts __aligned(8); + } buffer; }; /* @@ -270,24 +289,34 @@ static int adxrs290_read_raw(struct iio_dev *indio_dev, switch (mask) { case IIO_CHAN_INFO_RAW: + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + switch (chan->type) { case IIO_ANGL_VEL: ret = adxrs290_get_rate_data(indio_dev, ADXRS290_READ_REG(chan->address), val); if (ret < 0) - return ret; + break; - return IIO_VAL_INT; + ret = IIO_VAL_INT; + break; case IIO_TEMP: ret = adxrs290_get_temp_data(indio_dev, val); if (ret < 0) - return ret; + break; - return IIO_VAL_INT; + ret = IIO_VAL_INT; + break; default: - return -EINVAL; + ret = -EINVAL; + break; } + + iio_device_release_direct_mode(indio_dev); + return ret; case IIO_CHAN_INFO_SCALE: switch (chan->type) { case IIO_ANGL_VEL: @@ -334,34 +363,52 @@ static int adxrs290_write_raw(struct iio_dev *indio_dev, long mask) { struct adxrs290_state *st = iio_priv(indio_dev); - int lpf_idx, hpf_idx; + int ret, lpf_idx, hpf_idx; + + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; switch (mask) { case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY: lpf_idx = adxrs290_find_match(adxrs290_lpf_3db_freq_hz_table, ARRAY_SIZE(adxrs290_lpf_3db_freq_hz_table), val, val2); - if (lpf_idx < 0) - return -EINVAL; + if (lpf_idx < 0) { + ret = -EINVAL; + break; + } + /* caching the updated state of the low-pass filter */ st->lpf_3db_freq_idx = lpf_idx; /* retrieving the current state of the high-pass filter */ hpf_idx = st->hpf_3db_freq_idx; - return adxrs290_set_filter_freq(indio_dev, lpf_idx, hpf_idx); + ret = adxrs290_set_filter_freq(indio_dev, lpf_idx, hpf_idx); + break; + case IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY: hpf_idx = adxrs290_find_match(adxrs290_hpf_3db_freq_hz_table, ARRAY_SIZE(adxrs290_hpf_3db_freq_hz_table), val, val2); - if (hpf_idx < 0) - return -EINVAL; + if (hpf_idx < 0) { + ret = -EINVAL; + break; + } + /* caching the updated state of the high-pass filter */ st->hpf_3db_freq_idx = hpf_idx; /* retrieving the current state of the low-pass filter */ lpf_idx = st->lpf_3db_freq_idx; - return adxrs290_set_filter_freq(indio_dev, lpf_idx, hpf_idx); + ret = adxrs290_set_filter_freq(indio_dev, lpf_idx, hpf_idx); + break; + + default: + ret = -EINVAL; + break; } - return -EINVAL; + iio_device_release_direct_mode(indio_dev); + return ret; } static int adxrs290_read_avail(struct iio_dev *indio_dev, @@ -389,6 +436,72 @@ static int adxrs290_read_avail(struct iio_dev *indio_dev, } } +static int adxrs290_data_rdy_trigger_set_state(struct iio_trigger *trig, + bool state) +{ + struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); + struct adxrs290_state *st = iio_priv(indio_dev); + int ret; + u8 val; + + val = state ? ADXRS290_SYNC(ADXRS290_DATA_RDY_OUT) : 0; + + ret = adxrs290_spi_write_reg(st->spi, ADXRS290_REG_DATA_RDY, val); + if (ret < 0) + dev_err(&st->spi->dev, "failed to start data rdy interrupt\n"); + + return ret; +} + +static int adxrs290_reset_trig(struct iio_trigger *trig) +{ + struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); + int val; + + /* + * Data ready interrupt is reset after a read of the data registers. + * Here, we only read the 16b DATAY registers as that marks the end of + * a read of the data registers and initiates a reset for the interrupt + * line. + */ + adxrs290_get_rate_data(indio_dev, + ADXRS290_READ_REG(ADXRS290_REG_DATAY0), &val); + + return 0; +} + +static const struct iio_trigger_ops adxrs290_trigger_ops = { + .set_trigger_state = &adxrs290_data_rdy_trigger_set_state, + .validate_device = &iio_trigger_validate_own_device, + .try_reenable = &adxrs290_reset_trig, +}; + +static irqreturn_t adxrs290_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->indio_dev; + struct adxrs290_state *st = iio_priv(indio_dev); + u8 tx = ADXRS290_READ_REG(ADXRS290_REG_DATAX0); + int ret; + + mutex_lock(&st->lock); + + /* exercise a bulk data capture starting from reg DATAX0... */ + ret = spi_write_then_read(st->spi, &tx, sizeof(tx), st->buffer.channels, + sizeof(st->buffer.channels)); + if (ret < 0) + goto out_unlock_notify; + + iio_push_to_buffers_with_timestamp(indio_dev, &st->buffer, + pf->timestamp); + +out_unlock_notify: + mutex_unlock(&st->lock); + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; +} + #define ADXRS290_ANGL_VEL_CHANNEL(reg, axis) { \ .type = IIO_ANGL_VEL, \ .address = reg, \ @@ -401,6 +514,13 @@ static int adxrs290_read_avail(struct iio_dev *indio_dev, .info_mask_shared_by_type_available = \ BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) | \ BIT(IIO_CHAN_INFO_HIGH_PASS_FILTER_3DB_FREQUENCY), \ + .scan_index = ADXRS290_IDX_##axis, \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_LE, \ + }, \ } static const struct iio_chan_spec adxrs290_channels[] = { @@ -411,7 +531,20 @@ static const struct iio_chan_spec adxrs290_channels[] = { .address = ADXRS290_REG_TEMP0, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .scan_index = ADXRS290_IDX_TEMP, + .scan_type = { + .sign = 's', + .realbits = 12, + .storagebits = 16, + .endianness = IIO_LE, + }, }, + IIO_CHAN_SOFT_TIMESTAMP(ADXRS290_IDX_TS), +}; + +static const unsigned long adxrs290_avail_scan_masks[] = { + BIT(ADXRS290_IDX_X) | BIT(ADXRS290_IDX_Y) | BIT(ADXRS290_IDX_TEMP), + 0 }; static const struct iio_info adxrs290_info = { @@ -420,6 +553,44 @@ static const struct iio_info adxrs290_info = { .read_avail = &adxrs290_read_avail, }; +static int adxrs290_probe_trigger(struct iio_dev *indio_dev) +{ + struct adxrs290_state *st = iio_priv(indio_dev); + int ret; + + if (!st->spi->irq) { + dev_info(&st->spi->dev, "no irq, using polling\n"); + return 0; + } + + st->dready_trig = devm_iio_trigger_alloc(&st->spi->dev, "%s-dev%d", + indio_dev->name, + indio_dev->id); + if (!st->dready_trig) + return -ENOMEM; + + st->dready_trig->dev.parent = &st->spi->dev; + st->dready_trig->ops = &adxrs290_trigger_ops; + iio_trigger_set_drvdata(st->dready_trig, indio_dev); + + ret = devm_request_irq(&st->spi->dev, st->spi->irq, + &iio_trigger_generic_data_rdy_poll, + IRQF_ONESHOT, "adxrs290_irq", st->dready_trig); + if (ret < 0) + return dev_err_probe(&st->spi->dev, ret, + "request irq %d failed\n", st->spi->irq); + + ret = devm_iio_trigger_register(&st->spi->dev, st->dready_trig); + if (ret) { + dev_err(&st->spi->dev, "iio trigger register failed\n"); + return ret; + } + + indio_dev->trig = iio_trigger_get(st->dready_trig); + + return 0; +} + static int adxrs290_probe(struct spi_device *spi) { struct iio_dev *indio_dev; @@ -439,6 +610,7 @@ static int adxrs290_probe(struct spi_device *spi) indio_dev->channels = adxrs290_channels; indio_dev->num_channels = ARRAY_SIZE(adxrs290_channels); indio_dev->info = &adxrs290_info; + indio_dev->available_scan_masks = adxrs290_avail_scan_masks; mutex_init(&st->lock); @@ -478,6 +650,17 @@ static int adxrs290_probe(struct spi_device *spi) st->lpf_3db_freq_idx = val; st->hpf_3db_freq_idx = val2; + ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, + &iio_pollfunc_store_time, + &adxrs290_trigger_handler, NULL); + if (ret < 0) + return dev_err_probe(&spi->dev, ret, + "iio triggered buffer setup failed\n"); + + ret = adxrs290_probe_trigger(indio_dev); + if (ret < 0) + return ret; + return devm_iio_device_register(&spi->dev, indio_dev); } From patchwork Thu Sep 10 18:04:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Malpani X-Patchwork-Id: 11768549 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 5F94159D for ; Thu, 10 Sep 2020 18:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33C1A207EA for ; Thu, 10 Sep 2020 18:06:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t28s2ohA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbgIJSGg (ORCPT ); Thu, 10 Sep 2020 14:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726399AbgIJSFr (ORCPT ); Thu, 10 Sep 2020 14:05:47 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BBABC061757; Thu, 10 Sep 2020 11:05:47 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id w7so5091875pfi.4; Thu, 10 Sep 2020 11:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mEwZSmSPM9tJPXbfj/hisKYRPYb4G1wKBGhUAXFVXQE=; b=t28s2ohAlSG3nVPgGmhJ9BtHHniLCxcuBl1dSx2uX8dRKSd84C+/w6E7KceCTwhEBG DMLxo6p3upAgq3btstD8SUZfDQypTTqA2JjOm/dbtwqTeWvJkJPI/5RiO6DMh7EhFImN cqM46aKbyCYnaGx0RX3lIaSognEZkwZ+15E5fDWU/2p9wP+ZTLkAXbHSMvrX8lscBbq+ //h0PQuybrORv3zCLQ48eqLcTQO7n8EW7BXnEoOcUNay1NpF0sAkwi5bf1I9fmltNYK1 t/GmQjm4oZM4MHB1RkNXfpcgOwHN/BLhFPI32MDk6Vtln8npZF4aq2QB0ZqT2BcTJPNL a0Zw== 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=mEwZSmSPM9tJPXbfj/hisKYRPYb4G1wKBGhUAXFVXQE=; b=TEFhcUSWGu4ys6+jgIF1SLuKtZ4navr/XjilKRCJQS0shY5fMKEKACc27Q/1Z/wqjK duA3HcXIL9rlbhhRB+WJYNSTgdvRlfJ+qRel9YjRSndRRSKthDSkSMa1FevAiicAtQcz YdvORBRQ6IzODFgJAvnUKDzE5K3G1FgGpqg0nTXWUcCzMEIQyooSQeW2Hacl4HQJv28D EIkuAsVy793mpyBeDV8mYLlfecf0iLwv2BSIRS7xCXpPKD1jrCwDQS9bNgzHxiQdg+MN w8WF8pxZm4sjqHG2iJu+Nz32eGv2rBd8ZrTh3Y+DdMynZPfnmfksrv1SgjKF57vgkFhM NEAQ== X-Gm-Message-State: AOAM533bV8zGzsDH9m2gshi+kEPimwB6KYmYhsq2MJSPO4FaHb8VSCaO SIBLTnyz5DOJ2jXXa90i9kA= X-Google-Smtp-Source: ABdhPJzsznNUs52Ek6gTw2Dn9tG7jAPka/nCKtVSJh1zGME/XM/9xnhHT59acXC+Hho9CxqNHMkHDg== X-Received: by 2002:a62:8c86:: with SMTP id m128mr6545841pfd.111.1599761146894; Thu, 10 Sep 2020 11:05:46 -0700 (PDT) Received: from nish-HP-Pavilion ([2409:4072:6218:54d7:9928:e984:12bb:783d]) by smtp.gmail.com with ESMTPSA id f4sm5799390pfj.147.2020.09.10.11.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 11:05:46 -0700 (PDT) From: Nishant Malpani To: jic23@kernel.org, robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, andy.shevchenko@gmail.com, Nishant Malpani Subject: [RESEND PATCH v3 2/3] dt-bindings: iio: gyro: adxrs290: Add interrupts support Date: Thu, 10 Sep 2020 23:34:49 +0530 Message-Id: <20200910180450.29696-3-nish.malpani25@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910180450.29696-1-nish.malpani25@gmail.com> References: <20200910180450.29696-1-nish.malpani25@gmail.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Include 'interrupts' property and provide a suitable example for using a GPIO interrupt line. Signed-off-by: Nishant Malpani --- Changes in v3: - remove gpio.h header since unused Changes in v2: - remove 'interrupts' property from the required properties list - rewrite commit message --- .../devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml b/Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml index 61adb2c2454b..662ec59ca0af 100644 --- a/Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml +++ b/Documentation/devicetree/bindings/iio/gyroscope/adi,adxrs290.yaml @@ -28,6 +28,9 @@ properties: spi-cpha: true + interrupts: + maxItems: 1 + required: - compatible - reg @@ -39,6 +42,7 @@ additionalProperties: false examples: - | + #include spi { #address-cells = <1>; #size-cells = <0>; @@ -48,6 +52,8 @@ examples: spi-max-frequency = <5000000>; spi-cpol; spi-cpha; + interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; }; }; ... From patchwork Thu Sep 10 18:04:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Malpani X-Patchwork-Id: 11768551 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 2E8AD59D for ; Thu, 10 Sep 2020 18:07:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04F0A207EA for ; Thu, 10 Sep 2020 18:07:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CH6PGgp3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726855AbgIJSHM (ORCPT ); Thu, 10 Sep 2020 14:07:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726663AbgIJSF7 (ORCPT ); Thu, 10 Sep 2020 14:05:59 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E14DC0613ED; Thu, 10 Sep 2020 11:05:59 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id w186so4643809pgb.8; Thu, 10 Sep 2020 11:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zosGERDH1CFvyq304LgFyQ88QlOJKzUmNYvnZLuiMG8=; b=CH6PGgp3FSZ4qxodNPZ+nSskkygJJKKwLoJvqVniOEdi19tjDcntzdPZrGsN55HZnh nD5HK0osrtlErQmXrv8SJPuQ5qxhusfvT+Wxwi/vyIYnOkgj7lEzHhvFXVqslrVMn0Yc jFxrG1jhPRmNvcHl83Pak8EAHXbSelAeXCw7keaRLR/6Ca9/K1bNRK3gj9bmmBCDEYXD 4Q/WeF5uRWQO4i/zArgDcqf9BGiDSB14YqjHWf9fjnahIxkoUVMvXlgGOjyXTjkYiIUW YFFjegD82vq5KZvBGn7n/DUlL1UXxtV/MyJrwzCcAHsJbg7t0P6WJTfEfE4uKkqvrGxS IWVQ== 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=zosGERDH1CFvyq304LgFyQ88QlOJKzUmNYvnZLuiMG8=; b=sxhqhlYy/IXYoo8PtS2RMBAa3crBvXeI3YD9PesOTLMp76hbf0kNWnmKBMHncAJ00W 5YvTospuDjnz26VTpVHjnVXM+qRE89/mjxVFX14mJo0T6jWV2zJWmGE5Bi4bab6U0Vk+ 8Tz/4BWROZEjhkapGWUwKmuMaufx8ao83mY8Dvx7Q4aTKn9Ve87Bq5YVRgPz1VSlgQYB sEvSWymlC/NRhYaJacRObU0XiPmFUaj9kcq9ig1CSoXgZJlJQdbFW0Lozzjj5Q55zv6E ujuOWbSPyRrHaQGsOE9w40G2r5gctljuWwnlY7nWKT71mWSxowNIYjwoLx3secBytrtk tcjg== X-Gm-Message-State: AOAM531ZBCLfbL4pq1VBEqH2qSDh31XuAo0v8+GYxRD8FM4hmekChHJT sXjK79/vMdw4QTuu4IVS3p0= X-Google-Smtp-Source: ABdhPJxG9TWQJkNAZIED4Ou2mwJSB4vVmMpq06OclCcEhQb42xioXYD1oDdA06kF9HBMjA9cMMrCbQ== X-Received: by 2002:a63:c608:: with SMTP id w8mr3103345pgg.252.1599761158935; Thu, 10 Sep 2020 11:05:58 -0700 (PDT) Received: from nish-HP-Pavilion ([2409:4072:6218:54d7:9928:e984:12bb:783d]) by smtp.gmail.com with ESMTPSA id 64sm6679090pfz.204.2020.09.10.11.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 11:05:58 -0700 (PDT) From: Nishant Malpani To: jic23@kernel.org, robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org, andy.shevchenko@gmail.com, Nishant Malpani Subject: [RESEND PATCH v3 3/3] iio: gyro: adxrs290: Add debugfs register access support Date: Thu, 10 Sep 2020 23:34:50 +0530 Message-Id: <20200910180450.29696-4-nish.malpani25@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910180450.29696-1-nish.malpani25@gmail.com> References: <20200910180450.29696-1-nish.malpani25@gmail.com> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Extend support to read/write byte data from/to the device using debugfs iio interface. Reviewed-by: Andy Shevchenko Signed-off-by: Nishant Malpani --- Changes in v3: - refactor code based on Andy's suggestions No changes in v2 --- drivers/iio/gyro/adxrs290.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/iio/gyro/adxrs290.c b/drivers/iio/gyro/adxrs290.c index 41b1f995a143..ca6fc234076e 100644 --- a/drivers/iio/gyro/adxrs290.c +++ b/drivers/iio/gyro/adxrs290.c @@ -436,6 +436,31 @@ static int adxrs290_read_avail(struct iio_dev *indio_dev, } } +static int adxrs290_reg_access_rw(struct spi_device *spi, unsigned int reg, + unsigned int *readval) +{ + int ret; + + ret = spi_w8r8(spi, ADXRS290_READ_REG(reg)); + if (ret < 0) + return ret; + + *readval = ret; + + return 0; +} + +static int adxrs290_reg_access(struct iio_dev *indio_dev, unsigned int reg, + unsigned int writeval, unsigned int *readval) +{ + struct adxrs290_state *st = iio_priv(indio_dev); + + if (readval) + return adxrs290_reg_access_rw(st->spi, reg, readval); + else + return adxrs290_spi_write_reg(st->spi, reg, writeval); +} + static int adxrs290_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { @@ -551,6 +576,7 @@ static const struct iio_info adxrs290_info = { .read_raw = &adxrs290_read_raw, .write_raw = &adxrs290_write_raw, .read_avail = &adxrs290_read_avail, + .debugfs_reg_access = &adxrs290_reg_access, }; static int adxrs290_probe_trigger(struct iio_dev *indio_dev)