From: Antoine Tenart <antoine.tenart@free-electrons.com>
To: Hartmut Knaack <knaack.h@gmx.de>
Cc: linux-iio@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
Antoine Tenart <antoine.tenart@free-electrons.com>
Subject: Re: [PATCH v2 1/8] iio:adc:berlin2-adc: Fix register definition
Date: Thu, 30 Jul 2015 14:47:06 +0200 [thread overview]
Message-ID: <20150730124706.GA16416@kwain> (raw)
In-Reply-To: <b29e36386c3542057638334db8049cc64486157f.1438035998.git.knaack.h@gmx.de>
On Tue, Jul 28, 2015 at 12:38:57AM +0200, Hartmut Knaack wrote:
> Active channel number is stored in BERLIN2_SM_CTRL as value, instead of a
> bit map.
> The masks for channel interrupts and data ready are a 16 bits wide bit
> map each, instead of just 4 bits.
>
> Also correct the data mask for the temperature sensor, which was
> Reported-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>
> Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> ---
> drivers/iio/adc/berlin2-adc.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c
> index aecc9ad995ad..26fa6e6cb624 100644
> --- a/drivers/iio/adc/berlin2-adc.c
> +++ b/drivers/iio/adc/berlin2-adc.c
> @@ -26,7 +26,7 @@
> #define BERLIN2_SM_CTRL 0x14
> #define BERLIN2_SM_CTRL_SM_SOC_INT BIT(1)
> #define BERLIN2_SM_CTRL_SOC_SM_INT BIT(2)
> -#define BERLIN2_SM_CTRL_ADC_SEL(x) (BIT(x) << 5) /* 0-15 */
> +#define BERLIN2_SM_CTRL_ADC_SEL(x) ((x) << 5) /* 0-15 */
> #define BERLIN2_SM_CTRL_ADC_SEL_MASK (0xf << 5)
> #define BERLIN2_SM_CTRL_ADC_POWER BIT(9)
> #define BERLIN2_SM_CTRL_ADC_CLKSEL_DIV2 (0x0 << 10)
> @@ -53,14 +53,14 @@
> #define BERLIN2_SM_ADC_MASK 0x3ff
> #define BERLIN2_SM_ADC_STATUS 0x1c
> #define BERLIN2_SM_ADC_STATUS_DATA_RDY(x) BIT(x) /* 0-15 */
> -#define BERLIN2_SM_ADC_STATUS_DATA_RDY_MASK 0xf
> +#define BERLIN2_SM_ADC_STATUS_DATA_RDY_MASK GENMASK(15, 0)
> #define BERLIN2_SM_ADC_STATUS_INT_EN(x) (BIT(x) << 16) /* 0-15 */
> -#define BERLIN2_SM_ADC_STATUS_INT_EN_MASK (0xf << 16)
> +#define BERLIN2_SM_ADC_STATUS_INT_EN_MASK GENMASK(31, 16)
> #define BERLIN2_SM_TSEN_STATUS 0x24
> #define BERLIN2_SM_TSEN_STATUS_DATA_RDY BIT(0)
> #define BERLIN2_SM_TSEN_STATUS_INT_EN BIT(1)
> #define BERLIN2_SM_TSEN_DATA 0x28
> -#define BERLIN2_SM_TSEN_MASK 0xfff
> +#define BERLIN2_SM_TSEN_MASK GENMASK(9, 0)
> #define BERLIN2_SM_TSEN_CTRL 0x74
> #define BERLIN2_SM_TSEN_CTRL_START BIT(8)
> #define BERLIN2_SM_TSEN_CTRL_SETTLING_4 (0x0 << 21) /* 4 us */
> --
> 2.4.6
>
--
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-07-30 12:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 22:38 [PATCH v2 0/8] berlin2-adc fixes and cleanup Hartmut Knaack
2015-07-27 22:38 ` [PATCH v2 1/8] iio:adc:berlin2-adc: Fix register definition Hartmut Knaack
2015-07-30 12:47 ` Antoine Tenart [this message]
2015-08-02 17:59 ` Jonathan Cameron
2015-07-27 22:38 ` [PATCH v2 2/8] iio:adc:berlin2-adc: pass up real error code Hartmut Knaack
2015-08-02 18:06 ` Jonathan Cameron
2015-07-27 22:38 ` [PATCH v2 3/8] iio:adc:berlin2-adc: use GENMASK and BIT for masks Hartmut Knaack
2015-07-30 12:47 ` Antoine Tenart
2015-08-02 18:07 ` Jonathan Cameron
2015-08-12 21:11 ` Jonathan Cameron
2015-07-27 22:39 ` [PATCH v2 4/8] iio:adc:berlin2-adc: constify iio_chan_spec Hartmut Knaack
2015-08-02 18:07 ` Jonathan Cameron
2015-07-27 22:39 ` [PATCH v2 5/8] iio:adc:berlin2-adc: use short operator format Hartmut Knaack
2015-08-02 18:08 ` Jonathan Cameron
2015-07-27 22:39 ` [PATCH v2 6/8] iio:adc:berlin2-adc: use channel-array size directly Hartmut Knaack
2015-08-02 18:09 ` Jonathan Cameron
2015-07-27 22:39 ` [PATCH v2 7/8] iio:adc:berlin2-adc: enable interrupts with mutex locked Hartmut Knaack
2015-07-31 23:54 ` Hartmut Knaack
2015-08-12 21:13 ` Jonathan Cameron
2015-08-17 12:57 ` Antoine Tenart
2015-07-27 22:39 ` [PATCH v2 8/8] iio:adc:berlin2-adc: coding style cleanup Hartmut Knaack
2015-08-12 21:14 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150730124706.GA16416@kwain \
--to=antoine.tenart@free-electrons.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox