From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: at91: sama5d3: get rid of atmel_tsadcc driver
Date: Wed, 12 Mar 2014 15:20:26 +0100 [thread overview]
Message-ID: <53206D2A.1090403@atmel.com> (raw)
In-Reply-To: <1393432190-8799-1-git-send-email-ludovic.desroches@atmel.com>
On 26/02/2014 17:29, ludovic.desroches at atmel.com :
> From: Ludovic Desroches <ludovic.desroches@atmel•com>
>
> Touchscreen support for at91_adc has been introduced so we can get rid of
> atmel_tsadcc.
>
> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel•com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
stacked on at91-3.15-dt.
Thanks,
> ---
> arch/arm/boot/dts/sama5d3.dtsi | 14 +-------------
> arch/arm/boot/dts/sama5d3xdm.dtsi | 7 +++----
> 2 files changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index 3d5faf8..26d7ed5 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -239,7 +239,7 @@
> };
>
> adc0: adc at f8018000 {
> - compatible = "atmel,at91sam9260-adc";
> + compatible = "atmel,at91sam9x5-adc";
> reg = <0xf8018000 0x100>;
> interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
> pinctrl-names = "default";
> @@ -295,18 +295,6 @@
> };
> };
>
> - tsadcc: tsadcc at f8018000 {
> - compatible = "atmel,at91sam9x5-tsadcc";
> - reg = <0xf8018000 0x4000>;
> - interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
> - atmel,tsadcc_clock = <300000>;
> - atmel,filtering_average = <0x03>;
> - atmel,pendet_debounce = <0x08>;
> - atmel,pendet_sensitivity = <0x02>;
> - atmel,ts_sample_hold_time = <0x0a>;
> - status = "disabled";
> - };
> -
> i2c2: i2c at f801c000 {
> compatible = "atmel,at91sam9x5-i2c";
> reg = <0xf801c000 0x4000>;
> diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi
> index f9bdde5..0b8f5d1 100644
> --- a/arch/arm/boot/dts/sama5d3xdm.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xdm.dtsi
> @@ -23,10 +23,9 @@
> };
>
> adc0: adc at f8018000 {
> - status = "disabled";
> - };
> -
> - tsadcc: tsadcc at f8018000 {
> + atmel,adc-clock-rate = <1000000>;
> + atmel,adc-ts-wires = <4>;
> + atmel,adc-ts-pressure-threshold = <10000>;
> status = "okay";
> };
>
>
--
Nicolas Ferre
next prev parent reply other threads:[~2014-03-12 14:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 16:29 [PATCH] ARM: at91: sama5d3: get rid of atmel_tsadcc driver ludovic.desroches at atmel.com
2014-02-26 17:00 ` Alexandre Belloni
2014-03-12 14:20 ` Nicolas Ferre [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-26 16:19 ludovic.desroches at atmel.com
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=53206D2A.1090403@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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