Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features

Conflicts:
	arch/arm/mach-imx/mach-mx31_3ds.c
	arch/arm/mach-imx/mach-scb9328.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --cc arch/arm/mach-imx/mach-apf9328.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx31_3ds.c
index 62983bd,ab2a626..1446b35
--- 1/arch/arm/mach-imx/mach-mx31_3ds.c
--- 2/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@@ -686,9 -689,8 +686,11 @@@ static void __init mx31_3ds_init(void
  {
        int ret;
  
+       imx31_soc_init();
+ 
 +      /* Configure SPI1 IOMUX */
 +      mxc_iomux_set_gpr(MUX_PGP_CSPI_BB, true);
 +
        mxc_iomux_setup_multiple_pins(mx31_3ds_pins, ARRAY_SIZE(mx31_3ds_pins),
                                      "mx31_3ds");
  

diff --cc arch/arm/mach-imx/mach-mx31moboard.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx35_3ds.c
Simple merge

diff --cc arch/arm/mach-imx/mach-scb9328.c
index b773865,8280526..db2d604
--- 1/arch/arm/mach-imx/mach-scb9328.c
--- 2/arch/arm/mach-imx/mach-scb9328.c
+++ b/arch/arm/mach-imx/mach-scb9328.c
@@@ -115,9 -129,8 +115,11 @@@ static struct platform_device *devices[
   */
  static void __init scb9328_init(void)
  {
+       imx1_soc_init();
+ 
 +      mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
 +                      ARRAY_SIZE(mxc_uart1_pins), "UART1");
 +
        imx1_add_imx_uart0(&uart_pdata);
  
        printk(KERN_INFO"Scb9328: Adding devices\n");

diff --cc arch/arm/mach-mx5/board-cpuimx51.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_3ds.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge

diff --cc drivers/gpio/Kconfig
index 2967002,57d7bc5..5e6fc22
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -87,20 -87,41 +87,29 @@@ config GPIO_IT8761
          Say yes here to support GPIO functionality of IT8761E super I/O chip.
  
  config GPIO_EXYNOS4
 -      bool "Samsung Exynos4 GPIO library support"
 -      default y if CPU_EXYNOS4210
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung Exynos4 series SoCs GPIO library
 +      def_bool y
 +      depends on CPU_EXYNOS4210
  
+ config GPIO_MXS
+       def_bool y
+       depends on ARCH_MXS
+ 
+ config GPIO_MXC
+       def_bool y
+       depends on ARCH_MXC
+       select GPIO_BASIC_MMIO_CORE
+ 
  config GPIO_PLAT_SAMSUNG
 -      bool "Samsung SoCs GPIO library support"
 -      default y if SAMSUNG_GPIOLIB_4BIT
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung SoCs GPIO library
 +      def_bool y
 +      depends on SAMSUNG_GPIOLIB_4BIT
  
  config GPIO_S5PC100
 -      bool "Samsung S5PC100 GPIO library support"
 -      default y if CPU_S5PC100
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung S5PC100 SoCs GPIO library
 +      def_bool y
 +      depends on CPU_S5PC100
  
  config GPIO_S5PV210
 -      bool "Samsung S5PV210/S5PC110 GPIO library support"
 -      default y if CPU_S5PV210
 -      depends on ARM
 -      help
 -        Say yes here to support Samsung S5PV210/S5PC110 SoCs GPIO library
 +      def_bool y
 +      depends on CPU_S5PV210
  
  config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"