From patchwork Tue Apr 4 07:47:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 96700 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp72274qgd; Tue, 4 Apr 2017 00:49:28 -0700 (PDT) X-Received: by 10.98.102.88 with SMTP id a85mr22293010pfc.33.1491292168516; Tue, 04 Apr 2017 00:49:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65si4911424pfr.279.2017.04.04.00.49.28; Tue, 04 Apr 2017 00:49:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752730AbdDDHtL (ORCPT + 25 others); Tue, 4 Apr 2017 03:49:11 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:34674 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752213AbdDDHtJ (ORCPT ); Tue, 4 Apr 2017 03:49:09 -0400 Received: by mail-wr0-f177.google.com with SMTP id t20so23365953wra.1 for ; Tue, 04 Apr 2017 00:49:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/W6FgriLDArvfBMEuuUED9pCpmYISLTLOgd7rm8yGYA=; b=eyKwXwITR7td2wS3bMka+4ziudQT6paUJzzgzykvyvQc+tOlBEQHt8lGyALwiyvpmW dBDa6hbolkom4LJNj6j9LsQVqbV7lCNXODur0bVFRgv02e2BPni7wF1+6qOeK37AExww L0RRJPv+zOOMeOMqLnaaxvPb/uA8rTVxe4xyU= 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; bh=/W6FgriLDArvfBMEuuUED9pCpmYISLTLOgd7rm8yGYA=; b=rcqi3ju1FJ7A4hmhE3T5ZMDsybdAl3p1G+4+uyGAkiYwUgqsc7/R/DR9Hg0Vulp9aa OYr+UWa28K360NvV6zSF6aa3aeGGef/uW+FbxBQGjtjycx4LgU5HNTI+I1zQfGp7ZLyg a92BaYo8ORjLwByx4yMCEBAu+gRPeCpRkzf6iZdmxCy7pSq5RyhTfV6EWmGdN9Df3jOx rxIJ8EGpJfEUVnpzIqhLtH5aODwJVGITuXinN9uSU/6yu/HTKztKfTYmZS23mwYhgtmW omihvQn2jMgQFocp9L1uyla/RJG/oWVZQafryfU1oO5ZWF2RwMHQLQKQ3BOqoTbsGvOp cWKA== X-Gm-Message-State: AFeK/H3dW61XljvC1kRTBAG3cFSgYInK3F4/OJGdUdoE6POMunty+WSM 7AFx90onXQbXrfCo X-Received: by 10.28.109.147 with SMTP id b19mr13192057wmi.69.1491292137625; Tue, 04 Apr 2017 00:48:57 -0700 (PDT) Received: from lmenx321.st.com. ([80.214.31.74]) by smtp.gmail.com with ESMTPSA id t68sm21247320wrc.55.2017.04.04.00.48.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Apr 2017 00:48:57 -0700 (PDT) From: Benjamin Gaignard X-Google-Original-From: Benjamin Gaignard To: linux-kernel@vger.kernel.org, jic23@kernel.org, linux-iio@vger.kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, vilhelm.gray@gmail.com, mwelling@ieee.org Cc: fabrice.gasnier@st.com, linaro-kernel@lists.linaro.org, benjamin.gaignard@linaro.org, Benjamin Gaignard Subject: [PATCH v4 2/2] iio: stm32 trigger: Add counter enable modes Date: Tue, 4 Apr 2017 09:47:52 +0200 Message-Id: <1491292072-8535-3-git-send-email-benjamin.gaignard@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491292072-8535-1-git-send-email-benjamin.gaignard@st.com> References: <1491292072-8535-1-git-send-email-benjamin.gaignard@st.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Device counting could be controlled by the level or the edges of a trigger. in_count0_enable_mode attibute allow to set the control mode. Signed-off-by: Benjamin Gaignard --- version 4: - reword triggered description .../ABI/testing/sysfs-bus-iio-timer-stm32 | 25 ++++++++ drivers/iio/trigger/stm32-timer-trigger.c | 70 ++++++++++++++++++++++ 2 files changed, 95 insertions(+) -- 1.9.1 diff --git a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 index a55ad44..230020e 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 +++ b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 @@ -65,3 +65,28 @@ Description: quadrature: Encoder A and B inputs are mixed to get direction and count with a scale of 0.25. + +What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available +KernelVersion: 4.12 +Contact: benjamin.gaignard@st.com +Description: + Reading returns the list possible enable modes. + +What: /sys/bus/iio/devices/iio:deviceX/in_count0_enable_mode +KernelVersion: 4.12 +Contact: benjamin.gaignard@st.com +Description: + Configure the device counter enable modes, in all case + counting direction is set by in_count0_count_direction + attribute and the counter is clocked by the internal clock. + always: + Counter is always ON. + + gated: + Counting is enabled when connected trigger signal + level is high else counting is disabled. + + triggered: + Counting is enabled on rising edge of the connected + trigger, and remains enabled for the duration of this + selected mode. diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c index 7db904c..0f1a2cf 100644 --- a/drivers/iio/trigger/stm32-timer-trigger.c +++ b/drivers/iio/trigger/stm32-timer-trigger.c @@ -353,6 +353,74 @@ static int stm32_counter_write_raw(struct iio_dev *indio_dev, .write_raw = stm32_counter_write_raw }; +static const char *const stm32_enable_modes[] = { + "always", + "gated", + "triggered", +}; + +static int stm32_enable_mode2sms(int mode) +{ + switch (mode) { + case 0: + return 0; + case 1: + return 5; + case 2: + return 6; + } + + return -EINVAL; +} + +static int stm32_set_enable_mode(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + unsigned int mode) +{ + struct stm32_timer_trigger *priv = iio_priv(indio_dev); + int sms = stm32_enable_mode2sms(mode); + + if (sms < 0) + return sms; + + regmap_update_bits(priv->regmap, TIM_SMCR, TIM_SMCR_SMS, sms); + + return 0; +} + +static int stm32_sms2enable_mode(int mode) +{ + switch (mode) { + case 0: + return 0; + case 5: + return 1; + case 6: + return 2; + } + + return -EINVAL; +} + +static int stm32_get_enable_mode(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan) +{ + struct stm32_timer_trigger *priv = iio_priv(indio_dev); + u32 smcr; + + regmap_read(priv->regmap, TIM_SMCR, &smcr); + smcr &= TIM_SMCR_SMS; + + return stm32_sms2enable_mode(smcr); +} + +static const struct iio_enum stm32_enable_mode_enum = { + .items = stm32_enable_modes, + .num_items = ARRAY_SIZE(stm32_enable_modes), + .set = stm32_set_enable_mode, + .get = stm32_get_enable_mode +}; + static const char *const stm32_quadrature_modes[] = { "channel_A", "channel_B", @@ -466,6 +534,8 @@ static ssize_t stm32_count_set_preset(struct iio_dev *indio_dev, IIO_ENUM_AVAILABLE("count_direction", &stm32_count_direction_enum), IIO_ENUM("quadrature_mode", IIO_SEPARATE, &stm32_quadrature_mode_enum), IIO_ENUM_AVAILABLE("quadrature_mode", &stm32_quadrature_mode_enum), + IIO_ENUM("enable_mode", IIO_SEPARATE, &stm32_enable_mode_enum), + IIO_ENUM_AVAILABLE("enable_mode", &stm32_enable_mode_enum), {} };