From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Jul 2011 21:50:57 +0000 (-0700)
Subject: Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~313
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c7c8518498e82591d7784452f5674c3aeb4d079c

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6: (61 commits)
  gpio/mxc/mxs: fix build error introduced by the irq_gc_ack() renaming
  mcp23s08: add i2c support
  mcp23s08: isolate spi specific parts
  mcp23s08: get rid of setup/teardown callbacks
  gpio/tegra: dt: add binding for gpio polarity
  mcp23s08: remove unused work queue
  gpio/da9052: remove a redundant assignment for gpio->da9052
  gpio/mxc: add device tree probe support
  ARM: mxc: use ARCH_NR_GPIOS to define gpio number
  gpio/mxc: get rid of the uses of cpu_is_mx()
  gpio/mxc: add missing initialization of basic_mmio_gpio shadow variables
  gpio: Move mpc5200 gpio driver to drivers/gpio
  GPIO: DA9052 GPIO module v3
  gpio/tegra: Use engineering names in DT compatible property
  of/gpio: Add new method for getting gpios under different property names
  gpio/dt: Refine GPIO device tree binding
  gpio/ml-ioh: fix off-by-one for displaying variable i in dev_err
  gpio/pca953x: Deprecate meaningless device-tree bindings
  gpio/pca953x: Remove dynamic platform data pointer
  gpio/pca953x: Fix IRQ support.
  ...
---

c7c8518498e82591d7784452f5674c3aeb4d079c
diff --cc arch/arm/mach-omap1/gpio15xx.c
index 364137c2042c,f79c6aef11af..399da4ce017b
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@@ -39,9 -49,10 +49,10 @@@ static struct __initdata omap_gpio_plat
  	.bank_type		= METHOD_MPUIO,
  	.bank_width		= 16,
  	.bank_stride		= 1,
+ 	.regs			= &omap15xx_mpuio_regs,
  };
  
 -static struct __initdata platform_device omap15xx_mpu_gpio = {
 +static struct platform_device omap15xx_mpu_gpio = {
  	.name           = "omap_gpio",
  	.id             = 0,
  	.dev            = {
@@@ -68,9 -89,10 +89,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE,
  	.bank_type		= METHOD_GPIO_1510,
  	.bank_width		= 16,
+ 	.regs                   = &omap15xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap15xx_gpio = {
 +static struct platform_device omap15xx_gpio = {
  	.name           = "omap_gpio",
  	.id             = 1,
  	.dev            = {
diff --cc arch/arm/mach-omap1/gpio16xx.c
index 293a246e2824,c69b3b104286..0f399bd0e70e
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@@ -42,9 -52,10 +52,10 @@@ static struct __initdata omap_gpio_plat
  	.bank_type		= METHOD_MPUIO,
  	.bank_width		= 16,
  	.bank_stride		= 1,
+ 	.regs                   = &omap16xx_mpuio_regs,
  };
  
 -static struct __initdata platform_device omap16xx_mpu_gpio = {
 +static struct platform_device omap16xx_mpu_gpio = {
  	.name           = "omap_gpio",
  	.id             = 0,
  	.dev            = {
@@@ -71,9 -95,10 +95,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE,
  	.bank_type		= METHOD_GPIO_1610,
  	.bank_width		= 16,
+ 	.regs                   = &omap16xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap16xx_gpio1 = {
 +static struct platform_device omap16xx_gpio1 = {
  	.name           = "omap_gpio",
  	.id             = 1,
  	.dev            = {
@@@ -100,9 -125,10 +125,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 16,
  	.bank_type		= METHOD_GPIO_1610,
  	.bank_width		= 16,
+ 	.regs                   = &omap16xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap16xx_gpio2 = {
 +static struct platform_device omap16xx_gpio2 = {
  	.name           = "omap_gpio",
  	.id             = 2,
  	.dev            = {
@@@ -129,9 -155,10 +155,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 32,
  	.bank_type		= METHOD_GPIO_1610,
  	.bank_width		= 16,
+ 	.regs                   = &omap16xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap16xx_gpio3 = {
 +static struct platform_device omap16xx_gpio3 = {
  	.name           = "omap_gpio",
  	.id             = 3,
  	.dev            = {
@@@ -158,9 -185,10 +185,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 48,
  	.bank_type		= METHOD_GPIO_1610,
  	.bank_width		= 16,
+ 	.regs                   = &omap16xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap16xx_gpio4 = {
 +static struct platform_device omap16xx_gpio4 = {
  	.name           = "omap_gpio",
  	.id             = 4,
  	.dev            = {
diff --cc arch/arm/mach-omap1/gpio7xx.c
index c6ad248d63a6,d7f2ad3e6ac7..5ab63eab0ff5
--- a/arch/arm/mach-omap1/gpio7xx.c
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@@ -44,9 -54,10 +54,10 @@@ static struct __initdata omap_gpio_plat
  	.bank_type		= METHOD_MPUIO,
  	.bank_width		= 32,
  	.bank_stride		= 2,
+ 	.regs                   = &omap7xx_mpuio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_mpu_gpio = {
 +static struct platform_device omap7xx_mpu_gpio = {
  	.name           = "omap_gpio",
  	.id             = 0,
  	.dev            = {
@@@ -73,9 -94,10 +94,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio1 = {
 +static struct platform_device omap7xx_gpio1 = {
  	.name           = "omap_gpio",
  	.id             = 1,
  	.dev            = {
@@@ -102,9 -124,10 +124,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 32,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio2 = {
 +static struct platform_device omap7xx_gpio2 = {
  	.name           = "omap_gpio",
  	.id             = 2,
  	.dev            = {
@@@ -131,9 -154,10 +154,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 64,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio3 = {
 +static struct platform_device omap7xx_gpio3 = {
  	.name           = "omap_gpio",
  	.id             = 3,
  	.dev            = {
@@@ -160,9 -184,10 +184,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 96,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio4 = {
 +static struct platform_device omap7xx_gpio4 = {
  	.name           = "omap_gpio",
  	.id             = 4,
  	.dev            = {
@@@ -189,9 -214,10 +214,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 128,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio5 = {
 +static struct platform_device omap7xx_gpio5 = {
  	.name           = "omap_gpio",
  	.id             = 5,
  	.dev            = {
@@@ -218,9 -244,10 +244,10 @@@ static struct __initdata omap_gpio_plat
  	.virtual_irq_start	= IH_GPIO_BASE + 160,
  	.bank_type		= METHOD_GPIO_7XX,
  	.bank_width		= 32,
+ 	.regs			= &omap7xx_gpio_regs,
  };
  
 -static struct __initdata platform_device omap7xx_gpio6 = {
 +static struct platform_device omap7xx_gpio6 = {
  	.name           = "omap_gpio",
  	.id             = 6,
  	.dev            = {