Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754140AbdG3Nqr (ORCPT ); Sun, 30 Jul 2017 09:46:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:39720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbdG3Nqp (ORCPT ); Sun, 30 Jul 2017 09:46:45 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 88AE722BE3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=jic23@kernel.org Date: Sun, 30 Jul 2017 14:46:41 +0100 From: Jonathan Cameron To: Fabrice Gasnier Cc: , , , , , , , , , Subject: Re: [PATCH 3/4] iio: trigger: stm32-timer: fix get/set down count direction Message-ID: <20170730144641.7a8825eb@kernel.org> In-Reply-To: <1501172340-8448-4-git-send-email-fabrice.gasnier@st.com> References: <1501172340-8448-1-git-send-email-fabrice.gasnier@st.com> <1501172340-8448-4-git-send-email-fabrice.gasnier@st.com> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2235 Lines: 61 On Thu, 27 Jul 2017 18:18:59 +0200 Fabrice Gasnier wrote: > Fixes: 4adec7da0536 ("iio: stm32 trigger: Add quadrature encoder device") > > This fixes two issues: > - stm32_set_count_direction: to set down direction > - stm32_get_count_direction: to get down direction > > IIO core provides/expects value to be an index of iio_enum items array. > This needs to be turned by these routines into TIM_CR1_DIR (e.g. BIT(4)) > value. > Also, report error when attempting to write direction, when in encoder > mode: in this case, direction is read only (given by encoder inputs). > > Signed-off-by: Fabrice Gasnier Applied to the fixes-togreg branch of iio.git. Thanks, Jonathan > --- > drivers/iio/trigger/stm32-timer-trigger.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/drivers/iio/trigger/stm32-timer-trigger.c b/drivers/iio/trigger/stm32-timer-trigger.c > index 107918b..d28aa02 100644 > --- a/drivers/iio/trigger/stm32-timer-trigger.c > +++ b/drivers/iio/trigger/stm32-timer-trigger.c > @@ -594,13 +594,20 @@ static int stm32_get_quadrature_mode(struct iio_dev *indio_dev, > > static int stm32_set_count_direction(struct iio_dev *indio_dev, > const struct iio_chan_spec *chan, > - unsigned int mode) > + unsigned int dir) > { > struct stm32_timer_trigger *priv = iio_priv(indio_dev); > + u32 val; > + int mode; > > - regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_DIR, mode); > + /* In encoder mode, direction is RO (given by TI1/TI2 signals) */ > + regmap_read(priv->regmap, TIM_SMCR, &val); > + mode = (val & TIM_SMCR_SMS) - 1; > + if ((mode >= 0) || (mode < ARRAY_SIZE(stm32_quadrature_modes))) > + return -EBUSY; > > - return 0; > + return regmap_update_bits(priv->regmap, TIM_CR1, TIM_CR1_DIR, > + dir ? TIM_CR1_DIR : 0); > } > > static int stm32_get_count_direction(struct iio_dev *indio_dev, > @@ -611,7 +618,7 @@ static int stm32_get_count_direction(struct iio_dev *indio_dev, > > regmap_read(priv->regmap, TIM_CR1, &cr1); > > - return (cr1 & TIM_CR1_DIR); > + return ((cr1 & TIM_CR1_DIR) ? 1 : 0); > } > > static const struct iio_enum stm32_count_direction_enum = {