From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Oct 2012 23:20:20 +0000 (-0700)
Subject: Merge tag 'pinctrl-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: MMI-PSA29.97-13-9~15867
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=06fe918e9f177dc2a0592b0ad40a6ce4920b2033;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'pinctrl-for-v3.7' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl changes from Linus Walleij:
 "Some of this stuff is hitting arch/arm/* and have been ACKed by the
  ARM SoC folks, or it's device tree bindings pertaining to the specific
  driver.

  These are the bulk pinctrl changes for kernel v3.7:
   - Add subdrivers for the DB8540 and NHK8815 Nomadik-type ASICs,
     provide platform config for the Nomadik.
   - Add a driver for the i.MX35.
   - Add a driver for the BCM2835, an advanced GPIO expander.
   - Various fixes and clean-ups and minor improvements for the core,
     Nomadik, pinctr-single, sirf drivers.
   - Some platform config for the ux500."

* tag 'pinctrl-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (27 commits)
  pinctrl: add bcm2835 driver
  pinctrl: clarify idle vs sleep states
  pinctrl/nomadik: use irq_find_mapping()
  pinctrl: sirf: add lost chained_irq_enter and exit in sirfsoc_gpio_handle_irq
  pinctrl: sirf: initialize the irq_chip pointer of pinctrl_gpio_range
  pinctrl: sirf: fix spinlock deadlock in sirfsoc_gpio_set_input
  pinctrl: sirf: add missing pins to pinctrl list
  pinctrl: sirf: fix a typo in sirfsoc_gpio_probe
  pinctrl: pinctrl-single: add debugfs pin h/w state info
  ARM: ux500: 8500: update I2C sleep states pinctrl
  pinctrl: Fix potential memory leak in pinctrl_register_one_pin()
  ARM: ux500: tidy up pin sleep modes
  ARM: ux500: fix spi2 pin group
  pinctrl: imx: remove duplicated const
  pinctrl: document semantics vs GPIO
  ARM: ux500: 8500: use hsit_a_2 group for HSI
  pinctrl: use kasprintf() in pinmux_request_gpio()
  pinctrl: pinctrl-single: Add pinctrl-single,bits type of mux
  pinctrl/nomadik : add MC1_a_2 pin MC1 function group list
  pinctrl: pinctrl-single: Make sure we do not change bits outside of mask
  ...
---

06fe918e9f177dc2a0592b0ad40a6ce4920b2033
diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index 92a00260d074,66862fb981f9..bfa1eab91f41
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -33,8 -34,9 +34,9 @@@
  
  #include <plat/gpio-nomadik.h>
  #include <plat/mtu.h>
+ #include <plat/pincfg.h>
  
 -#include <mach/nand.h>
 +#include <linux/platform_data/mtd-nomadik-nand.h>
  #include <mach/fsmc.h>
  
  #include "cpu-8815.h"