summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2012-05-16 15:37:06 (GMT)
committerArnd Bergmann <arnd@arndb.de>2012-05-18 13:02:56 (GMT)
commit73d68d91aa1b9e9cb6c1635143799c0fec484c08 (patch)
tree70ee5e9b0e173c7d24fd4171924389ba7ccf4049 /arch/arm/boot
parent26690863e2c1fa4fee5f6137b219f4b8a1a02287 (diff)
downloadlinux-fsl-qoriq-73d68d91aa1b9e9cb6c1635143799c0fec484c08.tar.xz
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi35
-rw-r--r--arch/arm/boot/dts/at91sam9g20.dtsi8
2 files changed, 43 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index f4605ff..f449efc 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 0eb1a75..2a1d1ca 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>;
+ };
+ };
+ };
};