[PATCH v4 2/2] gpio/mxc: Change gpio-mxc into an upstanding gpio driver
From: s.hauer@pengutronix.de (Sascha Hauer)
Date: 2011-06-06 08:47:27
Also in:
lkml
On Mon, Jun 06, 2011 at 02:18:29AM -0600, Grant Likely wrote:
On Mon, Jun 6, 2011 at 2:12 AM, Sascha Hauer [off-list ref] wrote:quoted
On Mon, Jun 06, 2011 at 01:52:41AM -0600, Grant Likely wrote:quoted
On Mon, Jun 06, 2011 at 12:07:55AM +0800, Shawn Guo wrote:quoted
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 <redacted> Acked-by: Olof Johansson <redacted>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 |