| Message ID | 20120512021726.GC17875@S2101-09.ap.freescale.net |
|---|---|
| State | New |
| Headers | show |
Shawn, On Fri, May 11, 2012 at 7:17 PM, Shawn Guo <shawn.guo@linaro.org> wrote: > Hi Arnd, Olof, > > This series adds dummy pinctrl states for imx and mxs platforms and > then adopts pinctrl support for some outstanding imx and mxs drivers. > The reason that the series mixes two sub-architectures patches is some > drivers are shared between two sub-architectures, so we need to handle > them as a whole. > > I haven't got the acks from all subsystem maintainers. Considering > we are close to merge window now, and the change is quite simple while > mxs device tree series depends on it, I would like to send the pull > request right away and hopefully to get it expose on linux-next soon. > I copied subsystem maintainers here in case they see problem to have > their patches go through arm-soc. > > It depends on pinctrl branch below. > > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel (or for-next) > > Per Linus, his devel branch is identify to for-next, and both branches > are stable (non-rebased). The driver changes looks reasonably contained, so I pulled this branch in. If we get a hard NACK from someone we can drop it if we have to (but hopefully that won't happen). Please double-check that my conflict resolution in for-next was done right. -Olof
On Fri, May 11, 2012 at 11:55:14PM -0700, Olof Johansson wrote: > Please double-check that my conflict resolution in for-next was done right. > Thanks Olof. It looks all good.
On Sat, May 12, 2012 at 10:17:28AM +0800, Shawn Guo wrote: > I copied subsystem maintainers here in case they see problem to have > their patches go through arm-soc. Not quite successful there... > ASoC: mxs-saif: adopt pinctrl support Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> This is much more the workflow we normally use for this sort of stuff - minimal, split out topic branches rather than a single branch with a whole raft of dependencies on different subsystems. We shouldn't be doing complex staging through arm-soc, if that becomes the norm then we really should have a tree where that sort of thing happens for the kernel at large rather than using arm-soc.
On 13 May 2012 18:33, Mark Brown <broonie@opensource.wolfsonmicro.com> wrote: > On Sat, May 12, 2012 at 10:17:28AM +0800, Shawn Guo wrote: > >> I copied subsystem maintainers here in case they see problem to have >> their patches go through arm-soc. > > Not quite successful there... > I did not copy you here because I have collected your ack on the patch below. [1] Regards, Shawn >> ASoC: mxs-saif: adopt pinctrl support > > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> > [1] http://thread.gmane.org/gmane.linux.serial/7752/focus=97325
Hi Arnd, Olof, This series adds dummy pinctrl states for imx and mxs platforms and then adopts pinctrl support for some outstanding imx and mxs drivers. The reason that the series mixes two sub-architectures patches is some drivers are shared between two sub-architectures, so we need to handle them as a whole. I haven't got the acks from all subsystem maintainers. Considering we are close to merge window now, and the change is quite simple while mxs device tree series depends on it, I would like to send the pull request right away and hopefully to get it expose on linux-next soon. I copied subsystem maintainers here in case they see problem to have their patches go through arm-soc. It depends on pinctrl branch below. git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel (or for-next) Per Linus, his devel branch is identify to for-next, and both branches are stable (non-rebased). Regards, Shawn The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a: Linux 3.4-rc5 (2012-04-29 15:19:10 -0700) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git imx/pinctrl/for-3.5 Dong Aisheng (3): ARM: imx: enable pinctrl dummy states ARM: imx6q: switch to use pinctrl subsystem mmc: sdhci-imx-esdhc: adopt pinctrl support Shawn Guo (14): ARM: mxs: enable pinctrl dummy states tty: serial: imx: adopt pinctrl support net: fec: adopt pinctrl support can: flexcan: adopt pinctrl support i2c: imx: adopt pinctrl support spi/imx: adopt pinctrl support serial: amba-pl011: adopt pinctrl support serial: mxs-auart: adopt pinctrl support mmc: mxs-mmc: adopt pinctrl support mtd: nand: gpmi: adopt pinctrl support i2c: mxs: adopt pinctrl support ASoC: mxs-saif: adopt pinctrl support video: mxsfb: adopt pinctrl support ARM: mxs: enable pinctrl support arch/arm/Kconfig | 1 + arch/arm/mach-imx/Kconfig | 2 ++ arch/arm/mach-imx/imx51-dt.c | 3 +++ arch/arm/mach-imx/imx53-dt.c | 3 +++ arch/arm/mach-imx/mach-imx6q.c | 7 +++++++ arch/arm/mach-imx/mm-imx1.c | 2 ++ arch/arm/mach-imx/mm-imx21.c | 2 ++ arch/arm/mach-imx/mm-imx25.c | 2 ++ arch/arm/mach-imx/mm-imx27.c | 2 ++ arch/arm/mach-imx/mm-imx3.c | 2 ++ arch/arm/mach-imx/mm-imx5.c | 2 ++ arch/arm/mach-mxs/Kconfig | 2 ++ arch/arm/mach-mxs/include/mach/common.h | 2 ++ arch/arm/mach-mxs/mach-apx4devkit.c | 2 ++ arch/arm/mach-mxs/mach-m28evk.c | 2 ++ arch/arm/mach-mxs/mach-mx23evk.c | 2 ++ arch/arm/mach-mxs/mach-mx28evk.c | 2 ++ arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 ++ arch/arm/mach-mxs/mach-tx28.c | 2 ++ arch/arm/mach-mxs/mm.c | 11 +++++++++++ drivers/i2c/busses/i2c-imx.c | 8 ++++++++ drivers/i2c/busses/i2c-mxs.c | 6 ++++++ drivers/mmc/host/mxs-mmc.c | 8 ++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 9 +++++++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++ drivers/net/can/flexcan.c | 6 ++++++ drivers/net/ethernet/freescale/fec.c | 9 +++++++++ drivers/spi/spi-imx.c | 8 ++++++++ drivers/tty/serial/amba-pl011.c | 8 ++++++++ drivers/tty/serial/imx.c | 8 ++++++++ drivers/tty/serial/mxs-auart.c | 8 ++++++++ drivers/video/mxsfb.c | 9 +++++++++ sound/soc/mxs/mxs-saif.c | 8 ++++++++ 33 files changed, 159 insertions(+), 0 deletions(-)