• Linus Torvalds's avatar
    Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 813a95e5
    Linus Torvalds authored
    Pull arm soc-specific pinctrl changes from Olof Johansson:
     "With this, five platforms are moving to the relatively new pinctrl
      subsystem for their pin management, replacing the older soc specific
      in-kernel interfaces with common code.
    
      There is quite a bit of net addition of code for each platform being
      added to the pinctrl subsystem.  But the payback comes later when
      adding new boards can be done by only providing new device trees
      instead."
    
    Fix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}
    
    * tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
      mtd: nand: gpmi: fix compile error caused by pinctrl call
      ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig
      ARM: nomadik: enable PINCTRL_NOMADIK where needed
      ARM: mxs: enable pinctrl support
      video: mxsfb: adopt pinctrl support
      ASoC: mxs-saif: adopt pinctrl support
      i2c: mxs: adopt pinctrl supp...
    813a95e5
Kconfig 64.9 KB