From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
Date: Wed, 16 May 2012 17:37:06 +0200 [thread overview]
Message-ID: <1337182626-13033-1-git-send-email-nicolas.ferre@atmel.com> (raw)
In-Reply-To: <4FB3B1F3.6080102@atmel.com>
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>
---
arch/arm/boot/dts/at91sam9260.dtsi | 35 +++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/at91sam9g20.dtsi | 8 ++++++++
2 files changed, 43 insertions(+)
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 at 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 at 0 {
+ trigger-name = "timer-counter-0";
+ trigger-value = <0x1>;
+ };
+ trigger at 1 {
+ trigger-name = "timer-counter-1";
+ trigger-value = <0x3>;
+ };
+
+ trigger at 2 {
+ trigger-name = "timer-counter-2";
+ trigger-value = <0x5>;
+ };
+
+ trigger at 3 {
+ trigger-name = "external";
+ trigger-value = <0x13>;
+ trigger-external;
+ };
+ };
};
nand0: nand at 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 at fffe0000 {
+ atmel,adc-startup-time = <40>;
+ };
+ };
+ };
};
--
1.7.10
next prev parent reply other threads:[~2012-05-16 15:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 8:58 linux-next: manual merge of the arm-soc tree with the staging tree Stephen Rothwell
2012-05-16 10:54 ` Arnd Bergmann
2012-05-16 12:48 ` Greg KH
2012-05-16 13:03 ` Arnd Bergmann
2012-05-16 13:10 ` Greg KH
2012-05-16 13:41 ` Arnd Bergmann
2012-05-16 13:56 ` Nicolas Ferre
2012-05-16 14:33 ` Arnd Bergmann
2012-05-16 15:37 ` Nicolas Ferre [this message]
2012-05-16 18:50 ` [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files Arnd Bergmann
2012-05-17 15:06 ` Greg KH
2012-05-17 22:44 ` Stephen Rothwell
2012-05-18 13:03 ` Arnd Bergmann
2012-05-21 10:10 ` Nicolas Ferre
2012-05-21 23:19 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337182626-13033-1-git-send-email-nicolas.ferre@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).