From: Jonathan Cameron <jic23@kernel.org>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
linux-arm-kernel@lists.infradead.org, Josh Wu <josh.wu@atmel.com>,
leupold@rsi-elektrotechnik.de, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: adc: at91_adc: allow to use full range of startup time
Date: Sun, 21 Jun 2015 14:07:04 +0100 [thread overview]
Message-ID: <5586B6F8.9020806@kernel.org> (raw)
In-Reply-To: <20150618140232.GE27492@piout.net>
On 18/06/15 15:02, Alexandre Belloni wrote:
> On 17/06/2015 at 18:21:36 +0200, Nicolas Ferre wrote :
>> From: Jan Leupold <leupold@rsi-elektrotechnik.de>
>>
>> The DT-Property "atmel,adc-startup-time" is stored in an u8 for a microsecond
>> value. When trying to increase the value of STARTUP in Register AT91_ADC_MR
>> some higher values can't be reached.
>>
>> Change the type in function parameter and private structure field from u8 to
>> u32.
>>
>> Signed-off-by: Jan Leupold <leupold@rsi-elektrotechnik.de>
>> [nicolas.ferre@atmel.com: change commit message, increase u16 to u32 for startup time]
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Probably won't now go upstream until post merge window.
Thanks,
Jonathan
>
>> ---
>> drivers/iio/adc/at91_adc.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
>> index 8a0eb4a04fb5..7b40925dd4ff 100644
>> --- a/drivers/iio/adc/at91_adc.c
>> +++ b/drivers/iio/adc/at91_adc.c
>> @@ -182,7 +182,7 @@ struct at91_adc_caps {
>> u8 ts_pen_detect_sensitivity;
>>
>> /* startup time calculate function */
>> - u32 (*calc_startup_ticks)(u8 startup_time, u32 adc_clk_khz);
>> + u32 (*calc_startup_ticks)(u32 startup_time, u32 adc_clk_khz);
>>
>> u8 num_channels;
>> struct at91_adc_reg_desc registers;
>> @@ -201,7 +201,7 @@ struct at91_adc_state {
>> u8 num_channels;
>> void __iomem *reg_base;
>> struct at91_adc_reg_desc *registers;
>> - u8 startup_time;
>> + u32 startup_time;
>> u8 sample_hold_time;
>> bool sleep_mode;
>> struct iio_trigger **trig;
>> @@ -779,7 +779,7 @@ ret:Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> return ret;
>> }
>>
>> -static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)
>> +static u32 calc_startup_ticks_9260(u32 startup_time, u32 adc_clk_khz)
>> {
>> /*
>> * Number of ticks needed to cover the startup time of the ADC
>> @@ -790,7 +790,7 @@ static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)
>> return round_up((startup_time * adc_clk_khz / 1000) - 1, 8) / 8;
>> }
>>
>> -static u32 calc_startup_ticks_9x5(u8 startup_time, u32 adc_clk_khz)
>> +static u32 calc_startup_ticks_9x5(u32 startup_time, u32 adc_clk_khz)
>> {
>> /*
>> * For sama5d3x and at91sam9x5, the formula changes to:
>> --
>> 2.1.3
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at http://www.tux.org/lkml/
WARNING: multiple messages have this Message-ID (diff)
From: jic23@kernel.org (Jonathan Cameron)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] iio: adc: at91_adc: allow to use full range of startup time
Date: Sun, 21 Jun 2015 14:07:04 +0100 [thread overview]
Message-ID: <5586B6F8.9020806@kernel.org> (raw)
In-Reply-To: <20150618140232.GE27492@piout.net>
On 18/06/15 15:02, Alexandre Belloni wrote:
> On 17/06/2015 at 18:21:36 +0200, Nicolas Ferre wrote :
>> From: Jan Leupold <leupold@rsi-elektrotechnik.de>
>>
>> The DT-Property "atmel,adc-startup-time" is stored in an u8 for a microsecond
>> value. When trying to increase the value of STARTUP in Register AT91_ADC_MR
>> some higher values can't be reached.
>>
>> Change the type in function parameter and private structure field from u8 to
>> u32.
>>
>> Signed-off-by: Jan Leupold <leupold@rsi-elektrotechnik.de>
>> [nicolas.ferre at atmel.com: change commit message, increase u16 to u32 for startup time]
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Probably won't now go upstream until post merge window.
Thanks,
Jonathan
>
>> ---
>> drivers/iio/adc/at91_adc.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
>> index 8a0eb4a04fb5..7b40925dd4ff 100644
>> --- a/drivers/iio/adc/at91_adc.c
>> +++ b/drivers/iio/adc/at91_adc.c
>> @@ -182,7 +182,7 @@ struct at91_adc_caps {
>> u8 ts_pen_detect_sensitivity;
>>
>> /* startup time calculate function */
>> - u32 (*calc_startup_ticks)(u8 startup_time, u32 adc_clk_khz);
>> + u32 (*calc_startup_ticks)(u32 startup_time, u32 adc_clk_khz);
>>
>> u8 num_channels;
>> struct at91_adc_reg_desc registers;
>> @@ -201,7 +201,7 @@ struct at91_adc_state {
>> u8 num_channels;
>> void __iomem *reg_base;
>> struct at91_adc_reg_desc *registers;
>> - u8 startup_time;
>> + u32 startup_time;
>> u8 sample_hold_time;
>> bool sleep_mode;
>> struct iio_trigger **trig;
>> @@ -779,7 +779,7 @@ ret:Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
>> return ret;
>> }
>>
>> -static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)
>> +static u32 calc_startup_ticks_9260(u32 startup_time, u32 adc_clk_khz)
>> {
>> /*
>> * Number of ticks needed to cover the startup time of the ADC
>> @@ -790,7 +790,7 @@ static u32 calc_startup_ticks_9260(u8 startup_time, u32 adc_clk_khz)
>> return round_up((startup_time * adc_clk_khz / 1000) - 1, 8) / 8;
>> }
>>
>> -static u32 calc_startup_ticks_9x5(u8 startup_time, u32 adc_clk_khz)
>> +static u32 calc_startup_ticks_9x5(u32 startup_time, u32 adc_clk_khz)
>> {
>> /*
>> * For sama5d3x and at91sam9x5, the formula changes to:
>> --
>> 2.1.3
>>
>
next prev parent reply other threads:[~2015-06-21 13:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 16:21 [PATCH] iio: adc: at91_adc: allow to use full range of startup time Nicolas Ferre
2015-06-17 16:21 ` Nicolas Ferre
2015-06-18 14:02 ` Alexandre Belloni
2015-06-18 14:02 ` Alexandre Belloni
2015-06-21 13:07 ` Jonathan Cameron [this message]
2015-06-21 13:07 ` 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=5586B6F8.9020806@kernel.org \
--to=jic23@kernel.org \
--cc=alexandre.belloni@free-electrons.com \
--cc=josh.wu@atmel.com \
--cc=leupold@rsi-elektrotechnik.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@atmel.com \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@atmel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.