[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120125155258.GB3608@suse.de>
Date: Wed, 25 Jan 2012 07:52:58 -0800
From: Greg KH <gregkh@...e.de>
To: Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>
Cc: Greg KH <greg@...ah.com>, linux-kernel@...r.kernel.org,
Alan Cox <alan@...ux.intel.com>, kernel@...gutronix.de,
devicetree-discuss@...ts.ozlabs.org, linux-serial@...r.kernel.org
Subject: Re: [PATCH v4] serial/efm32: add new driver
On Wed, Jan 25, 2012 at 09:05:04AM +0100, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
> ---
> changes since v3 (id:1326127447-20284-1-git-send-email-u.kleine-koenig@...gutronix.de)
> - increase number of ports to support UART additionally to USART ports
> - implement choosing route location
> - implement setting stopbit config
> (before one stop bit was configured and CSTOPB was set unconditionally which
> is wrong. Spotted by Russell King.)
> - implement break, sysrq and overflow detection
> - drop unrelated changing to make patch apply on v3.3-rc1
>
> Hello Greg,
>
> On Tue, Jan 24, 2012 at 02:05:22PM -0800, Greg KH wrote:
> > On Mon, Jan 09, 2012 at 05:44:07PM +0100, Uwe Kleine-König wrote:
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
> > > ---
> > > Hello,
> > >
> > > changes since v2:
> > > - use {read,write}l_relaxed
> > > - rename driver to efm32-uart as USARTs and UARTs can be handled both
> > > with it
> > > - disable TX in .stop_tx (which needs some changes related to
> > > USARTn_IF_TXC)
> > >
> > > Best regards
> > > Uwe
> > >
> > > .../devicetree/bindings/tty/serial/efm32-uart.txt | 14 +
> > > arch/arm/boot/dts/efm32gg-dk3750.dts | 2 +-
> > > arch/arm/mach-efm32/devices/pdev-efm32-usart.c | 6 +-
> >
> > This file isn't in 3.3-rc1, so I can't apply this patch :(
> >
> > What tree is it supposed to be against?
> Sorry, I messed this up, it bases on my private development tree. These
> two changes should go independant of the driver patch via an ARM tree
> (if at all).
>
> I added a few more features in the meantime, so the options are:
> - take v3 simply droping the hunks changing
> arch/arm/boot/dts/efm32gg-dk3750.dts and
> arch/arm/mach-efm32/devices/pdev-efm32-usart.c
> - take this for 3.3
> - take this for 3.4
>
> My preference would be of course the second option, but for me the other two
> would be OK if you don't like taking the update that late, too.
I was going to take this for the 3.4 merge, adding it to my tree now.
It should be ok to drop those hunks, right?
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists