From 3c9f29a6fab59a6ef1567b6771786c1074ea5649 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 11 May 2012 15:35:40 +0200
Subject: [PATCH] --- yaml --- r: 304661 b: refs/heads/master c:
 7cb2e629a240d3b7cc35d2d144149591e1cfa8dd h: refs/heads/master i:   304659:
 5b0448fc2d39673aca1cb1b675ace2bfe2e0d1e7 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/boot/dts/at91sam9g20.dtsi | 35 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4217da66082c..db468269cbfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d029f371b1bf121dc73107094ab3108e47108e49
+refs/heads/master: 7cb2e629a240d3b7cc35d2d144149591e1cfa8dd
diff --git a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi b/trunk/arch/arm/boot/dts/at91sam9g20.dtsi
index 773ef484037a..767764ce01f1 100644
--- a/trunk/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/trunk/arch/arm/boot/dts/at91sam9g20.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 = <10>;
+				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 {