1 files changed, 9 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 3d5faf85f51b..eabcfdbb403a 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -239,7 +239,9 @@
                         };
 
                         adc0: adc@f8018000 {
-                                compatible = "atmel,at91sam9260-adc";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91sam9x5-adc";
                                 reg = <0xf8018000 0x100>;
                                 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
                                 pinctrl-names = "default";
@@ -261,52 +263,39 @@
                                 clocks = <&adc_clk>,
                                          <&adc_op_clk>;
                                 clock-names = "adc_clk", "adc_op_clk";
-                                atmel,adc-channel-base = <0x50>;
                                 atmel,adc-channels-used = <0xfff>;
-                                atmel,adc-drdy-mask = <0x1000000>;
-                                atmel,adc-num-channels = <12>;
                                 atmel,adc-startup-time = <40>;
-                                atmel,adc-status-register = <0x30>;
-                                atmel,adc-trigger-register = <0xc0>;
-                                atmel,adc-use-external;
+                                atmel,adc-use-external-triggers;
                                 atmel,adc-vref = <3000>;
                                 atmel,adc-res = <10 12>;
                                 atmel,adc-res-names = "lowres", "highres";
                                 status = "disabled";
 
                                 trigger@0 {
+                                        reg = <0>;
                                         trigger-name = "external-rising";
                                         trigger-value = <0x1>;
                                         trigger-external;
                                 };
                                 trigger@1 {
+                                        reg = <1>;
                                         trigger-name = "external-falling";
                                         trigger-value = <0x2>;
                                         trigger-external;
                                 };
                                 trigger@2 {
+                                        reg = <2>;
                                         trigger-name = "external-any";
                                         trigger-value = <0x3>;
                                         trigger-external;
                                 };
                                 trigger@3 {
+                                        reg = <3>;
                                         trigger-name = "continuous";
                                         trigger-value = <0x6>;
                                 };
                         };
 
-                        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>;
@@ -1256,6 +1245,7 @@
                         interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
                         atmel,nand-addr-offset = <21>;
                         atmel,nand-cmd-offset = <22>;
+                        atmel,nand-has-dma;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_nand0_ale_cle>;
                         atmel,pmecc-lookup-table-offset = <0x0 0x8000>;