]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: at91/dt: at91sam9x5: remove useless adc properties
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>
Mon, 10 Mar 2014 19:17:23 +0000 (20:17 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 12 Mar 2014 18:11:29 +0000 (19:11 +0100)
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>
arch/arm/boot/dts/at91sam9x5.dtsi

index 67e32067eb25517940d5d81d9e5f8797c6b39a13..fc13c9240da85c43c98f5aacdfc1bf76c1b955dc 100644 (file)
                        };
 
                        adc0: adc@f804c000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xf804c000 0x100>;
                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
-                               atmel,adc-use-external;
+                               atmel,adc-use-external-triggers;
                                atmel,adc-channels-used = <0xffff>;
                                atmel,adc-vref = <3300>;
-                               atmel,adc-num-channels = <12>;
                                atmel,adc-startup-time = <40>;
-                               atmel,adc-channel-base = <0x50>;
-                               atmel,adc-drdy-mask = <0x1000000>;
-                               atmel,adc-status-register = <0x30>;
-                               atmel,adc-trigger-register = <0xc0>;
                                atmel,adc-res = <8 10>;
                                atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-use-res = "highres";
 
                                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>;
                                };