ARM: at91: sama5d3: get rid of atmel_tsadcc driver

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: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index d075c5326ce71d7c0035f6c9e45f8585ce7c2f6b..b991e55e837dee5bbfc7d0a667c134d07e88e4b2 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -239,7 +239,7 @@
                        };
 
                        adc0: adc@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@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@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 f9bdde542ced2f9e0a76aa6ae73a5a7478215ae6..0b8f5d106ff2babaadf16e56e330a7220eade3cc 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xdm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xdm.dtsi
@@ -23,10 +23,9 @@
                        };
 
                        adc0: adc@f8018000 {
-                               status = "disabled";
-                       };
-
-                       tsadcc: tsadcc@f8018000 {
+                               atmel,adc-clock-rate = <1000000>;
+                               atmel,adc-ts-wires = <4>;
+                               atmel,adc-ts-pressure-threshold = <10000>;
                                status = "okay";
                        };