lkml.org 
[lkml]   [2011]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 0/3] Add device tree probe for imx/mxc gpio
On Fri, Jul 08, 2011 at 12:36:22PM +0200, Sascha Hauer wrote:
> On Thu, Jul 07, 2011 at 01:27:05PM -0600, Grant Likely wrote:
> > On Thu, Jul 07, 2011 at 12:37:40AM +0800, Shawn Guo wrote:
> > > The first patch removes the uses of cpu_is_mx(), the second one
> > > changes mxc gpio number macro, and the third one adds actual device
> > > tree probe support.
> > >
> > > Changes since v2:
> > > * Keep platform case gpio range code path unchanged, and get range
> > > from gpio core only for dt case.
> > >
> > > Changes since v1:
> > > * Address review comments given by Grant and Sascha
> > > * Add patch #1 to get gpio range/base from gpio core
> > >
> > > Shawn Guo (3):
> > > gpio/mxc: get rid of the uses of cpu_is_mx()
> > > ARM: mxc: use ARCH_NR_GPIOS to define gpio number
> > > gpio/mxc: add device tree probe support
> >
> > Sascha; so are we good? Should I merge this series?
>
> These patches neither fit onto your gpio tree nor on the i.MX tree. I
> suggest that we give these patches a rest until both trees are merged.
>
> That's the downside of moving core drivers to drivers/ and thus to
> different maintainers, but I think things will become better once
> the actual move is completed.

It's a trivial conflict though. I've gone ahead and picked up this
series and pushed it out to gpio/next. Shawn, please test the
gpio/next branch and make sure there aren't any regressions. I've
only done a bit of build testing.

g.

>
> Sascha
>
> >
> > g.
> >
> > >
> > > .../devicetree/bindings/gpio/fsl-imx-gpio.txt | 22 +++
> > > arch/arm/mach-imx/mm-imx1.c | 8 +-
> > > arch/arm/mach-imx/mm-imx21.c | 12 +-
> > > arch/arm/mach-imx/mm-imx25.c | 9 +-
> > > arch/arm/mach-imx/mm-imx27.c | 13 +-
> > > arch/arm/mach-imx/mm-imx31.c | 6 +-
> > > arch/arm/mach-imx/mm-imx35.c | 7 +-
> > > arch/arm/mach-mx5/mm-mx50.c | 13 +-
> > > arch/arm/mach-mx5/mm.c | 24 ++--
> > > arch/arm/plat-mxc/devices/platform-gpio-mxc.c | 4 +-
> > > arch/arm/plat-mxc/include/mach/common.h | 2 +-
> > > arch/arm/plat-mxc/include/mach/irqs.h | 21 +---
> > > drivers/gpio/gpio-mxc.c | 157 +++++++++++++++++---
> > > 13 files changed, 211 insertions(+), 87 deletions(-)
> > >
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > > the body of a message to majordomo@vger.kernel.org
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > > Please read the FAQ at http://www.tux.org/lkml/
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |


\
 
 \ /
  Last update: 2011-07-08 20:41    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site