From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Wed, 16 May 2012 17:37:06 +0200 Subject: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files In-Reply-To: <4FB3B1F3.6080102@atmel.com> References: <4FB3B1F3.6080102@atmel.com> Message-ID: <1337182626-13033-1-git-send-email-nicolas.ferre@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- 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