From: nicolas.ferre@atmel•com (Nicolas Ferre)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4] ARM/serial: at91: switch atmel serial to use gpiolib
Date: Fri, 6 Dec 2013 12:23:05 +0100 [thread overview]
Message-ID: <52A1B399.3090104@atmel.com> (raw)
In-Reply-To: <20131205202825.GB4707@pengutronix.de>
On 05/12/2013 21:28, Uwe Kleine-K?nig :
> Hello Nicolas,
>
> On Thu, Dec 05, 2013 at 05:57:04PM +0100, Nicolas Ferre wrote:
>> On 04/12/2013 20:16, Uwe Kleine-K?nig :
>>> On Wed, Dec 04, 2013 at 09:09:11AM -0800, Greg Kroah-Hartman wrote:
>>>> On Wed, Dec 04, 2013 at 11:23:53AM +0100, Uwe Kleine-K?nig wrote:
>>>>> Hello Greg, hi Nicolas,
>>>>>
>>>>> On Mon, Dec 02, 2013 at 09:47:50AM +0100, Nicolas Ferre wrote:
>>>>>> On 13/11/2013 17:28, Nicolas Ferre :
>>>>>>> On 07/11/2013 10:25, Linus Walleij :
>>>>>>>> This passes the errata fix using a GPIO to control the RTS pin
>>>>>>>> on one of the AT91 chips to use gpiolib instead of the
>>>>>>>> AT91-specific interfaces. Also remove the reliance on
>>>>>>>> compile-time #defines and the cpu_* check and rely on the
>>>>>>>> platform passing down the proper GPIO pin through platform
>>>>>>>> data.
>>>>>>>>
>>>>>>>> This is a prerequisite for getting rid of the local GPIO
>>>>>>>> implementation in the AT91 platform and move toward
>>>>>>>> multiplatform.
>>>>>>>>
>>>>>>>> The patch also adds device tree support for getting the
>>>>>>>> RTS GPIO pin from the device tree on DT boot paths.
>>>>>>>>
>>>>>>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel•com>
>>>>>>>> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
>>>>>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro•org>
>> [...]
>>> nferre: What is your plan with this patch? Do you have patches
>>> depending on it, too, or is it ok if I take it?
>>
>> Well, the problem is that your branch generates conflicts with the
>> at91/cleanup one that Olof have just pulled. They are not big
>> conflicts, only additions of header files at the same location.
>> Maybe you can rebase your branch on top of this cleanup branch
>> (arm-soc/next/cleanup: 94c5216ee93b3b4).
> Olof said on irc: "that's easy to fix, i'm ok with resolving that when i
> merge". That is what I prefer because I don't want to retest everything
> after rebasing.
>>
>> But, anyway I feel that it is better if you take the whole series in a raw.
> So I can interpret this as your blessing to keep the patch in my series
> based on 3.13-rc1?
Yes, sure.
Moreover, I read that you agreed with Olof about the merge conflict: so
everything is good and thanks a lot for taking care of this Uwe.
Bye,
--
Nicolas Ferre
next prev parent reply other threads:[~2013-12-06 11:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 9:25 [PATCH v4] ARM/serial: at91: switch atmel serial to use gpiolib Linus Walleij
2013-11-13 16:28 ` Nicolas Ferre
2013-12-02 8:47 ` Nicolas Ferre
2013-12-04 10:23 ` Uwe Kleine-König
2013-12-04 17:09 ` Greg Kroah-Hartman
2013-12-04 19:16 ` Uwe Kleine-König
2013-12-04 19:25 ` Greg Kroah-Hartman
2013-12-05 16:57 ` Nicolas Ferre
2013-12-05 20:28 ` Uwe Kleine-König
2013-12-06 11:23 ` Nicolas Ferre [this message]
2013-12-04 17:08 ` Greg Kroah-Hartman
2014-01-08 12:42 ` Linus Walleij
2014-01-08 12:54 ` Nicolas Ferre
2014-01-13 13:39 ` Linus Walleij
2014-01-31 15:04 ` Richard Genoud
2014-01-31 23:16 ` Olof Johansson
2014-02-03 8:34 ` Linus Walleij
2014-02-03 9:06 ` Uwe Kleine-König
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=52A1B399.3090104@atmel.com \
--to=nicolas.ferre@atmel$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/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