On Fri, Aug 30, 2013 at 11:49:41PM +0200, Gabor Juhos wrote: > 2013.08.30. 23:13 keltezéssel, Greg Kroah-Hartman írta: > > On Thu, Aug 29, 2013 at 11:48:15AM +0200, Gabor Juhos wrote: > >> Modify the probe routine to get the port line number > >> from device tree if the 'of_node' is populated in the > >> platform device. The driver can be built as module, > >> thus add an OF specific module device table as well > >> to support module auto loading. > >> > >> This makes it possible to use the driver for AR9330 > >> UART devices specified in device tree. > >> > >> Cc: devicetree@xxxxxxxxxxxxxxx > >> Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx> > >> --- > >> Changes since v1: > >> - move the doc from bindings/tty/serial to bindings/serial > >> > >> The patch is agains the 'tty-next' branch of the > >> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tree > > > > No it isn't, it fails to apply here :( > > Well, it was created on top of ... > > commit 9dfe59f15195b8c5bd4c2950266877c51fc329f0 > Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> > Date: Wed Aug 28 13:32:41 2013 -0700 > > ARM: dts: msm: Update uartdm compatible strings > > Let's follow the ratified DT binding and use uartdm instead of > hsuart. This does break backwards compatibility but this > shouldn't be a problem because the uart driver isn't probing on > these devices without adding clock support (which isn't merged so > far). > > Cc: David Brown <davidb@xxxxxxxxxxxxxx> > Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxx> > Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > ... and i can still apply the patch on top of that commit. > > However the current tty-next tree contains the previous version of the patch: > > commit dd910d98a2e240443db0090b0ae8a719a4a460f8 > Author: Gabor Juhos <juhosg@xxxxxxxxxxx> > Date: Thu Aug 29 08:44:01 2013 +0200 > > tty: ar933x_uart: add device tree support and binding documentation > > Modify the probe routine to get the port line number > from device tree if the 'of_node' is populated in the > platform device. The driver can be built as module, > thus add an OF specific module device table as well > to support module auto loading. > > This makes it possible to use the driver for AR9330 > UART devices specified in device tree. > > Cc: devicetree@xxxxxxxxxxxxxxx > Signed-off-by: Gabor Juhos <juhosg@xxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > And that is the reason why you can't apply v2. Probably you have missed my > preceding [1] mail. > > What should I do now? Should I send a follow-up patch which moves the > documentation from 'bindings/tty/serial' to bindings/serial? As I can't apply this one, I guess a new patch that I can apply will be the best, right? :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
