[PATCH] ARM: at91: sama5d3: get rid of atmel_tsadcc driver

[Alexandre Belloni]

On 26/02/2014 at 17:29:50 +0100, Ludovic Desroches wrote :
> From: Ludovic Desroches <ludovic.desroches at 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 at atmel.com>

Acked-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>

> ---
>  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";
>  			};
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140226/0d60c1dc/attachment.sig>