Hi Nicolas,
On Mon, 21 May 2012 12:10:11 +0200 Nicolas Ferre <nicolas.ferre@xxxxxxxxx> wrote:
>
> After checking the current status of
> arch/arm/boot/dts/at91sam9g20.dtsi in linux-next, it seems the merge
> resolution has not produced a good result:
>
> The "adc0" node, should only look like:
>
> ahb {
> apb {
> adc0: adc@fffe0000 {
> atmel,adc-startup-time = <40>;
> };
> };
> };
>
> without the redundant code carried by the staging git tree. In short,
> the arm-soc version is the proper one.
Rats! That was an automatic merge resolution and I didn't even notice,
sorry. I will fix it up today in linux-next, but someone needs to
remember to tell Linus when the second if these two trees is merged.
I will apply the following as a merge fixup patch after merging the
arm-soc tree (which comes later in my sequence):
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 22 May 2012 09:17:31 +1000
Subject: [PATCH] ARM:at91: merge fixup for dtsi file
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/arm/boot/dts/at91sam9g20.dtsi | 35 -----------------------------------
1 file changed, 35 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 06ca15b..2a1d1ca 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -21,41 +21,6 @@
adc0: adc@fffe0000 {
atmel,adc-startup-time = <40>;
};
-
- 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;
- };
- };
};
};
};
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpk2116MK8kR.pgp
Description: PGP signature
