| Message ID | 1359080696-31489-1-git-send-email-horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 25, 2013 at 11:23:36AM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider the following pinmux enhancements for 3.9. > > As discussed previously this series includes changes for shmobile (ARM > based SoC), the SH architecture and pinmux. It has been agreed by the > maintainers, Paul Mundt, Linus Walleij and myself in conjunction with the > patch-series author Laurent Pinchart and arm-soc co-maintainer Olof > Johansson to take this seies through my renesas tree and thus the arm-soc > tree as a single branch to avoid a complex set of branch dependencies. > > These changes have been sitting in next for several weeks now. > > I expect there to be a follow-up series of similar complexity > in the 3.10 time-frame. A focus of that series being to add DT bindings. > > ---------------------------------------------------------------- > The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20: > > Linux 3.8-rc3 (2013-01-09 18:59:55 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pfc This will go in through a next/sh-pinmux branch on its own given the size of the branch. It's been pulled and merged in with for-next. Thanks! -Olof
Hi Olof, Hi Arnd, please consider the following pinmux enhancements for 3.9. As discussed previously this series includes changes for shmobile (ARM based SoC), the SH architecture and pinmux. It has been agreed by the maintainers, Paul Mundt, Linus Walleij and myself in conjunction with the patch-series author Laurent Pinchart and arm-soc co-maintainer Olof Johansson to take this seies through my renesas tree and thus the arm-soc tree as a single branch to avoid a complex set of branch dependencies. These changes have been sitting in next for several weeks now. I expect there to be a follow-up series of similar complexity in the 3.10 time-frame. A focus of that series being to add DT bindings. ---------------------------------------------------------------- The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20: Linux 3.8-rc3 (2013-01-09 18:59:55 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pfc for you to fetch changes up to c3323806a67c0c656e27956b7340e37ba6c6968b: sh-pfc: Move sh_pfc.h from include/linux/ to driver directory (2013-01-25 09:24:31 +0900) ---------------------------------------------------------------- Laurent Pinchart (80): sh: sh7264: Rename CRX0CRX1 mark to match GPIO names sh: sh7269: Rename CRX0CRX1(CRX2) marks to match GPIO names sh: sh7723: Rename GPIO_FN_SIUOSPD to GPIO_FN_SIUAOSPD sh: sh7757: Fix GPIO_FN_ET0_MDIO and GPIO_FN_ET1_MDIO GPIO entries sh: sh7786: Fix port E, G and J GPIOs sh: sh7786: Fix last GPIO index sh: shx3: Fix last GPIO index sh-pfc: Split platform data from the sh_pfc structure sh-pfc: Move private definitions and declarations to private header sh-pfc: Merge PFC core and pinctrl sh-pfc: Merge PFC core and gpio sh-pfc: Move platform device and driver to the core sh-pfc: Use devm_kzalloc() sh-pfc: Use devm_ioremap_nocache() sh-pfc: Let the compiler decide whether to inline functions sh-pfc: Remove check for impossible error condition sh-pfc: Sort headers alphabetically sh-pfc: Use sh_pfc_ namespace prefix through the whole driver sh-pfc: Split platform device and platform driver registration sh-pfc: Support passing resources through platform device ARM: shmobile: Select PINCTRL ARM: shmobile: r8a7740: Register PFC platform device ARM: shmobile: r8a7779: Register PFC platform device ARM: shmobile: sh7372: Register PFC platform device ARM: shmobile: sh73a0: Register PFC platform device ARM: shmobile: r8a7740: Add pin control resources ARM: shmobile: sh7372: Add pin control resources ARM: shmobile: sh73a0: Add pin control resources sh: Add PFC platform device registration helper function sh: sh7203: Register PFC platform device sh: sh7264: Register PFC platform device sh: sh7269: Register PFC platform device sh: sh7720: Register PFC platform device sh: sh7722: Register PFC platform device sh: sh7723: Register PFC platform device sh: sh7724: Register PFC platform device sh: sh7734: Register PFC platform device sh: sh7757: Register PFC platform device sh: sh7785: Register PFC platform device sh: sh7786: Register PFC platform device sh: shx3: Register PFC platform device sh-pfc: Remove platform device registration sh-pfc: Remove unused resource and num_resources platform data fields sh-pfc: Move driver from drivers/sh/ to drivers/pinctrl/ sh-pfc: Support pinmux info in driver data instead of platform data sh-pfc: Add r8a7740 pinmux support sh-pfc: Add r8a7779 pinmux support sh-pfc: Add sh7372 pinmux support sh-pfc: Add sh73a0 pinmux support sh-pfc: Add sh7203 pinmux support sh-pfc: Add sh7264 pinmux support sh-pfc: Add sh7269 pinmux support sh-pfc: Add sh7720 pinmux support sh-pfc: Add sh7722 pinmux support sh-pfc: Add sh7723 pinmux support sh-pfc: Add sh7724 pinmux support sh-pfc: Add sh7734 pinmux support sh-pfc: Add sh7757 pinmux support sh-pfc: Add sh7785 pinmux support sh-pfc: Add sh7786 pinmux support sh-pfc: Add shx3 pinmux support ARM: shmobile: r8a7740: Use driver-provided pinmux info ARM: shmobile: r8a7779: Use driver-provided pinmux info ARM: shmobile: sh7372: Use driver-provided pinmux info ARM: shmobile: sh73a0: Use driver-provided pinmux info sh: sh7203: pinmux: Use driver-provided pinmux info sh: sh7264: pinmux: Use driver-provided pinmux info sh: sh7269: pinmux: Use driver-provided pinmux info sh: sh7720: pinmux: Use driver-provided pinmux info sh: sh7722: pinmux: Use driver-provided pinmux info sh: sh7723: pinmux: Use driver-provided pinmux info sh: sh7724: pinmux: Use driver-provided pinmux info sh: sh7734: pinmux: Use driver-provided pinmux info sh: sh7757: pinmux: Use driver-provided pinmux info sh: sh7785: pinmux: Use driver-provided pinmux info sh: sh7786: pinmux: Use driver-provided pinmux info sh: shx3: pinmux: Use driver-provided pinmux info sh: Remove unused sh_pfc_register_info() function sh-pfc: Remove pinmux_info definition sh-pfc: Move sh_pfc.h from include/linux/ to driver directory arch/arm/Kconfig | 1 + arch/arm/mach-shmobile/Makefile | 8 - arch/arm/mach-shmobile/setup-r8a7740.c | 26 + arch/arm/mach-shmobile/setup-r8a7779.c | 25 + arch/arm/mach-shmobile/setup-sh7372.c | 26 + arch/arm/mach-shmobile/setup-sh73a0.c | 25 + arch/sh/Kconfig | 12 + arch/sh/include/asm/gpio.h | 2 +- arch/sh/include/cpu-common/cpu/pfc.h | 26 + arch/sh/include/cpu-sh4/cpu/sh7723.h | 2 +- arch/sh/include/cpu-sh4/cpu/sh7786.h | 8 +- arch/sh/kernel/cpu/Makefile | 2 +- arch/sh/kernel/cpu/pfc.c | 33 + arch/sh/kernel/cpu/sh2a/pinmux-sh7203.c | 1582 +---------- arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 2121 +-------------- arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 2823 +------------------ arch/sh/kernel/cpu/sh3/pinmux-sh7720.c | 1226 +-------- arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 1778 +----------- arch/sh/kernel/cpu/sh4a/pinmux-sh7723.c | 1893 +------------ arch/sh/kernel/cpu/sh4a/pinmux-sh7724.c | 2210 +-------------- arch/sh/kernel/cpu/sh4a/pinmux-sh7734.c | 2470 +---------------- arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2267 +--------------- arch/sh/kernel/cpu/sh4a/pinmux-sh7785.c | 1294 +-------- arch/sh/kernel/cpu/sh4a/pinmux-sh7786.c | 822 +----- arch/sh/kernel/cpu/sh4a/pinmux-shx3.c | 573 +--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/Makefile | 2 + drivers/pinctrl/sh-pfc/Kconfig | 116 + drivers/pinctrl/sh-pfc/Makefile | 21 + drivers/{sh/pfc => pinctrl/sh-pfc}/core.c | 355 ++- drivers/pinctrl/sh-pfc/core.h | 72 + drivers/{sh/pfc => pinctrl/sh-pfc}/gpio.c | 114 +- .../pinctrl/sh-pfc}/pfc-r8a7740.c | 11 +- .../pinctrl/sh-pfc}/pfc-r8a7779.c | 29 +- drivers/pinctrl/sh-pfc/pfc-sh7203.c | 1592 +++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7264.c | 2131 +++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7269.c | 2834 ++++++++++++++++++++ .../pinctrl/sh-pfc}/pfc-sh7372.c | 11 +- .../pinctrl/sh-pfc}/pfc-sh73a0.c | 11 +- drivers/pinctrl/sh-pfc/pfc-sh7720.c | 1236 +++++++++ drivers/pinctrl/sh-pfc/pfc-sh7722.c | 1779 ++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7723.c | 1903 +++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7724.c | 2225 +++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7734.c | 2475 +++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7757.c | 2282 ++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7785.c | 1304 +++++++++ drivers/pinctrl/sh-pfc/pfc-sh7786.c | 837 ++++++ drivers/pinctrl/sh-pfc/pfc-shx3.c | 582 ++++ drivers/{sh/pfc => pinctrl/sh-pfc}/pinctrl.c | 164 +- {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h | 43 +- drivers/sh/Kconfig | 1 - drivers/sh/Makefile | 1 - drivers/sh/pfc/Kconfig | 26 - drivers/sh/pfc/Makefile | 3 - 54 files changed, 21897 insertions(+), 21520 deletions(-) create mode 100644 arch/sh/include/cpu-common/cpu/pfc.h create mode 100644 arch/sh/kernel/cpu/pfc.c create mode 100644 drivers/pinctrl/sh-pfc/Kconfig create mode 100644 drivers/pinctrl/sh-pfc/Makefile rename drivers/{sh/pfc => pinctrl/sh-pfc}/core.c (50%) create mode 100644 drivers/pinctrl/sh-pfc/core.h rename drivers/{sh/pfc => pinctrl/sh-pfc}/gpio.c (58%) rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-r8a7740.c (99%) rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-r8a7779.c (99%) create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7203.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7264.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7269.c rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-sh7372.c (99%) rename {arch/arm/mach-shmobile => drivers/pinctrl/sh-pfc}/pfc-sh73a0.c (99%) create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7720.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7722.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7723.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7724.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7734.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7757.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7785.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-sh7786.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-shx3.c rename drivers/{sh/pfc => pinctrl/sh-pfc}/pinctrl.c (75%) rename {include/linux => drivers/pinctrl/sh-pfc}/sh_pfc.h (83%) delete mode 100644 drivers/sh/pfc/Kconfig delete mode 100644 drivers/sh/pfc/Makefile