Merge branch 'at91/dt' into next/dt

This should help the merge with the at91 adc driver that is currently
in the staging tree.

* at91/dt:
  ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2 files changed, 43 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f4605ff25fb8..f449efc9825f 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -197,6 +197,41 @@
                                 interrupts = <10 4>;
                                 status = "disabled";
                         };
+
+                        adc0: adc@fffe0000 {
+                                compatible = "atmel,at91sam9260-adc";
+                                reg = <0xfffe0000 0x100>;
+                                interrupts = <5 4>;
+                                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>;
+
+                                trigger@0 {
+                                        trigger-name = "timer-counter-0";
+                                        trigger-value = <0x1>;
+                                };
+                                trigger@1 {
+                                        trigger-name = "timer-counter-1";
+                                        trigger-value = <0x3>;
+                                };
+
+                                trigger@2 {
+                                        trigger-name = "timer-counter-2";
+                                        trigger-value = <0x5>;
+                                };
+
+                                trigger@3 {
+                                        trigger-name = "external";
+                                        trigger-value = <0x13>;
+                                        trigger-external;
+                                };
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 0eb1a753f796..2a1d1ca8bd86 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -15,4 +15,12 @@
         memory {
                 reg = <0x20000000 0x08000000>;
         };
+
+        ahb {
+                apb {
+                        adc0: adc@fffe0000 {
+                                atmel,adc-startup-time = <40>;
+                        };
+                };
+        };
 };