• Olof Johansson's avatar
    Merge tag 'ux500-gpio-pins-for-3.5' of... · 7af07ad9
    Olof Johansson authored
    Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/pinctrl
    
    ux500 GPIO and pinctrl changes for kernel 3.5
    
    * tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
      ARM: ux500: switch MSP to using pinctrl for pins
      ARM: ux500: alter MSP registration to return a device pointer
      ARM: ux500: switch to using pinctrl for uart0
      ARM: ux500: delete custom pin control system
      ARM: ux500: switch over to Nomadik pinctrl driver
      pinctrl: add sleep state definition
      pinctrl/nomadik: implement pin configuration
      pinctrl/nomadik: implement pin multiplexing
      pinctrl/nomadik: reuse GPIO debug function for pins
      pinctrl/nomadik: break out single GPIO debug function
      pinctrl/nomadik: basic Nomadik pinctrl interface
      pinctrl/nomadik: !CONFIG_OF build error
      gpio: move the Nomadik GPIO driver to pinctrl
    
    Context conflicts resolved in drivers/pinctrl/Kconfig and
    drivers/pinctrl/Makefile.
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    7af07ad9
Kconfig 2.21 KB