Messages in this thread | | | Date | Mon, 6 Jun 2011 10:47:20 +0200 | From | Sascha Hauer <> | Subject | Re: [PATCH v4 2/2] gpio/mxc: Change gpio-mxc into an upstanding gpio driver |
| |
On Mon, Jun 06, 2011 at 02:18:29AM -0600, Grant Likely wrote: > On Mon, Jun 6, 2011 at 2:12 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > On Mon, Jun 06, 2011 at 01:52:41AM -0600, Grant Likely wrote: > >> On Mon, Jun 06, 2011 at 12:07:55AM +0800, Shawn Guo wrote: > >> > The patch makes necessary changes on gpio-mxc as below to turn it > >> > into an upstanding gpio driver. > >> > > >> > * Add a list to save all mx2 ports references, so that > >> > mx2_gpio_irq_handler can walk through all interrupt status > >> > registers > >> > > >> > * Use readl/writel to replace mach-specific accessors > >> > __raw_readl/__raw_writel > >> > > >> > * Change mxc_gpio_init into mxc_gpio_probe function > >> > > >> > * Move "struct mxc_gpio_port" into gpio-mxc.c, as it needs not to > >> > be public at all, and also make some other cleanup on > >> > plat-mxc/include/mach/gpio.h at the same time > >> > > >> > And the patch then migrates mach-imx and mach-mx5 to the updated > >> > driver by adding corresponding platform devices. > >> > > >> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > >> > Acked-by: Olof Johansson <olof@lixom.net> > >> > >> Applied, thanks. > > > > I'm not completely happy with this patch going through your tree. It > > does massive changes to arch/arm/mach-*mx*, so expect merge conflicts > > here. > > There are also massive changes going on in drivers/gpio. The solution > here is to probably put these changes into a new dedicated branch > based on Linus' tree, we both agree not to rebase that branch, and > both of us merge the branch into our trees.
That can work. I just checked that atm there are no conflicts between my branch and Shawns patches. Can you set up such a branch? Otherwise I can just keep an eye on conflicts and we set up such a branch once a real conflict arises.
Sascha
-- 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 | -- 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/
| |