Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / boot / dts / at91sam9260.dtsi

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 997901f7ed7381c77ff6c669f4f7571474ebd4b2..366fc2cbcd64c3f56495d104e5a744315c7c4345 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -608,37 +608,38 @@
                        };
 
                        adc0: adc@fffe0000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffe0000 0x100>;
                                interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-channels-used = <0xf>;
                                atmel,adc-vref = <3300>;
-                               atmel,adc-num-channels = <4>;
                                atmel,adc-startup-time = <15>;
-                               atmel,adc-channel-base = <0x30>;
-                               atmel,adc-drdy-mask = <0x10000>;
-                               atmel,adc-status-register = <0x1c>;
-                               atmel,adc-trigger-register = <0x04>;
                                atmel,adc-res = <8 10>;
                                atmel,adc-res-names = "lowres", "highres";
                                atmel,adc-use-res = "highres";
 
                                trigger@0 {
+                                       reg = <0>;
                                        trigger-name = "timer-counter-0";
                                        trigger-value = <0x1>;
                                };
                                trigger@1 {
+                                       reg = <1>;
                                        trigger-name = "timer-counter-1";
                                        trigger-value = <0x3>;
                                };
 
                                trigger@2 {
+                                       reg = <2>;
                                        trigger-name = "timer-counter-2";
                                        trigger-value = <0x5>;
                                };
 
                                trigger@3 {
+                                       reg = <3>;
                                        trigger-name = "external";
                                        trigger-value = <0x13>;
                                        trigger-external;