From mboxrd@z Thu Jan 1 00:00:00 1970 From: grant.likely@secretlab.ca (Grant Likely) Date: Mon, 6 Jun 2011 02:18:29 -0600 Subject: [PATCH v4 2/2] gpio/mxc: Change gpio-mxc into an upstanding gpio driver In-Reply-To: <20110606081205.GC32632@pengutronix.de> References: <1307290075-7062-1-git-send-email-shawn.guo@linaro.org> <1307290075-7062-3-git-send-email-shawn.guo@linaro.org> <20110606075241.GD10410@ponder.secretlab.ca> <20110606081205.GC32632@pengutronix.de> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Jun 6, 2011 at 2:12 AM, Sascha Hauer 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 >> > Acked-by: Olof Johansson >> >> 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. g.