ARM: at91/dt: sama5d3: remove useless adc properties

Remove the properties that are not used anymore by the at91_adc driver and fix
the atmel,adc-use-external-triggers property name.

Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.

Signed-off-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 b991e55e837dee5bbfc7d0a667c134d07e88e4b2..eabcfdbb403acc7ff40b409617a53c9831414c04 100644 (file)
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -239,6 +239,8 @@
                        };
 
                        adc0: adc@f8018000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                compatible = "atmel,at91sam9x5-adc";
                                reg = <0xf8018000 0x100>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
@@ -261,35 +263,34 @@
                                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>;
                                };

diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi
index 0b8f5d106ff2babaadf16e56e330a7220eade3cc..035ab72b39903c474aeb60c80a44ee0f9207d489 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xdm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xdm.dtsi
@@ -23,7 +23,6 @@
                        };
 
                        adc0: adc@f8018000 {
-                               atmel,adc-clock-rate = <1000000>;
                                atmel,adc-ts-wires = <4>;
                                atmel,adc-ts-pressure-threshold = <10000>;
                                status = "okay";