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

Now that the bulk of at91sam9g20-related nodes are located in at91sam9260.dtsi,
we have to re-create the path to this ADC node for SoC specific parts.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f4605ff25fb89cd6c36c925cae656cf78225f441..f449efc9825fd711d485b57318adf02b47e01f3e 100644 (file)
--- 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 0eb1a753f79677fc659764170f725884f35cfda4..2a1d1ca8bd86636426bddfb77cf2ef8610bb8b16 100644 (file)
--- 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>;
+                       };
+               };
+       };
 };