Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

Changes queued in gpio/next for the start of the 3.3 merge window

* tag 'gpio-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
  gpio: Add decode of WM8994 GPIO configuration
  gpio: Convert GPIO drivers to module_platform_driver
  gpio: Fix typo in comment in Samsung driver
  gpio: Explicitly index samsung_gpio_cfgs
  gpio: Add Linus Walleij as gpio co-maintainer
  of: Add device tree selftests
  of: create of_phandle_args to simplify return of phandle parsing data
  gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()
  gpio/microblaze: Eliminate duplication of of_get_named_gpio_flags()
  gpiolib: output basic details and consolidate gpio device drivers
  pch_gpio: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
  pch_gpio: Support new device LAPIS Semiconductor ML7831 IOH
  spi/pl022: make the chip deselect handling thread safe
  spi/pl022: add support for pm_runtime autosuspend
  spi/pl022: disable the PL022 block when unused
  spi/pl022: move device disable to workqueue thread
  spi/pl022: skip default configuration before suspending
  spi/pl022: fix build warnings
  spi/pl022: only enable RX interrupts when TX is complete

1 files changed, 20 insertions, 11 deletions

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index dcbe4541fe49..ab098ba9f1dd 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -230,7 +230,7 @@ static int samsung_gpio_setcfg_2bit(struct samsung_gpio_chip *chip,
  * @chip: The gpio chip that is being configured.
  * @off: The offset for the GPIO being configured.
  *
- * The reverse of samsung_gpio_setcfg_2bit(). Will return a value whicg
+ * The reverse of samsung_gpio_setcfg_2bit(). Will return a value which
  * could be directly passed back to samsung_gpio_setcfg_2bit(), from the
  * S3C_GPIO_SPECIAL() macro.
  */
@@ -467,33 +467,42 @@ static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = {
 #endif
 
 static struct samsung_gpio_cfg samsung_gpio_cfgs[] = {
-        {
+        [0] = {
                 .cfg_eint       = 0x0,
-        }, {
+        },
+        [1] = {
                 .cfg_eint       = 0x3,
-        }, {
+        },
+        [2] = {
                 .cfg_eint       = 0x7,
-        }, {
+        },
+        [3] = {
                 .cfg_eint       = 0xF,
-        }, {
+        },
+        [4] = {
                 .cfg_eint       = 0x0,
                 .set_config     = samsung_gpio_setcfg_2bit,
                 .get_config     = samsung_gpio_getcfg_2bit,
-        }, {
+        },
+        [5] = {
                 .cfg_eint       = 0x2,
                 .set_config     = samsung_gpio_setcfg_2bit,
                 .get_config     = samsung_gpio_getcfg_2bit,
-        }, {
+        },
+        [6] = {
                 .cfg_eint       = 0x3,
                 .set_config     = samsung_gpio_setcfg_2bit,
                 .get_config     = samsung_gpio_getcfg_2bit,
-        }, {
+        },
+        [7] = {
                 .set_config     = samsung_gpio_setcfg_2bit,
                 .get_config     = samsung_gpio_getcfg_2bit,
-        }, {
+        },
+        [8] = {
                 .set_pull       = exynos4_gpio_setpull,
                 .get_pull       = exynos4_gpio_getpull,
-        }, {
+        },
+        [9] = {
                 .cfg_eint       = 0x3,
                 .set_pull       = exynos4_gpio_setpull,
                 .get_pull       = exynos4_gpio_getpull,