From: Nicolas Ferre <nicolas.ferre@atmel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>, linux-next@vger•kernel.org
Cc: Greg KH <gregkh@linuxfoundation•org>,
Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org,
linux-kernel@vger•kernel.org, plagnioj@jcrosoft•com,
maxime.ripard@free-electrons•com, olof@lixom•net
Subject: Re: [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
Date: Mon, 21 May 2012 12:10:11 +0200 [thread overview]
Message-ID: <4FBA1483.4010008@atmel.com> (raw)
In-Reply-To: <20120518084446.a7b229074ea215fd7bcd1eb8@canb.auug.org.au>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 05/18/2012 12:44 AM, Stephen Rothwell :
> Hi all,
>
> On Thu, 17 May 2012 08:06:01 -0700 Greg KH
> <gregkh@linuxfoundation•org> wrote:
>>
>> On Wed, May 16, 2012 at 06:50:54PM +0000, Arnd Bergmann wrote:
>>> On Wednesday 16 May 2012, Nicolas Ferre wrote:
>>>> 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>
>>>
>>> Should we apply this patch in arm-soc so that Greg can drop the
>>> hunk that no longer applies?
>>
>> It's not a "no longer applies", it's a "this does not merge".
>> The patch is in my tree, unless you want me to revert it, it's
>> going to stay there until it goes to Linus.
>
> Just apply the patch to the arm-soc tree - then the merge
> resolution becomes "use the arm-soc version". There is no need
> for Greg to revert the other patch.
Hi Stephen,
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.
Thanks for your help, best regards,
- --
Nicolas Ferre
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPuhR7AAoJEAf03oE53VmQW4wH/0lqpqrTujJ/dQ0z5Ku7Xde3
EKKJm51AIlIadOXiteYH6cw34ISm68cXZWpkbKh3UKiCcJGSJi4VjCrkcJ//CwUL
B4bZD3A6Y8zLQ+TaQbjMnfzKq2dOBRQ1M1dNoQXwPe83vjV85T4hoKco7LBhGhUI
l//0aWrcefH9sQynAYRhNE0M6hlfr/Edlia0zHlkVYqE2K5ALxaH6lki2EUzxvJC
l8qydZ9lum37ebnot09WB2qhIlkRApb50sYbQG4nMwlC3jSblXrPelQvChWLo/yi
JOPOF7Lcj9fnJmeVGlQknobilgWmRnuVQUbqBG4NjDx71k5WiEywF6ymBa8TJnA=
=rnQu
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2012-05-21 10:10 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 ` [PATCH] ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files Nicolas Ferre
2012-05-16 18:50 ` 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 [this message]
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=4FBA1483.4010008@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=olof@lixom$(echo .)net \
--cc=plagnioj@jcrosoft$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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