Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index b6453d0e44ad..ba126cc04073 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2454,12 +2454,6 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
                 },
         }, {
                 .chip   = {
-                        .base   = EXYNOS5_GPC4(0),
-                        .ngpio  = EXYNOS5_GPIO_C4_NR,
-                        .label  = "GPC4",
-                },
-        }, {
-                .chip   = {
                         .base   = EXYNOS5_GPD0(0),
                         .ngpio  = EXYNOS5_GPIO_D0_NR,
                         .label  = "GPD0",
@@ -2513,6 +2507,12 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
                         .label  = "GPY6",
                 },
         }, {
+                .chip   = {
+                        .base   = EXYNOS5_GPC4(0),
+                        .ngpio  = EXYNOS5_GPIO_C4_NR,
+                        .label  = "GPC4",
+                },
+        }, {
                 .config = &samsung_gpio_cfgs[9],
                 .irq_base = IRQ_EINT(0),
                 .chip   = {
@@ -2681,11 +2681,14 @@ static int exynos_gpio_xlate(struct gpio_chip *gc,
 
         if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
                 pr_warn("gpio_xlate: failed to set pin function\n");
-        if (s3c_gpio_setpull(pin, gpiospec->args[2]))
+        if (s3c_gpio_setpull(pin, gpiospec->args[2] & 0xffff))
                 pr_warn("gpio_xlate: failed to set pin pull up/down\n");
         if (s5p_gpio_set_drvstr(pin, gpiospec->args[3]))
                 pr_warn("gpio_xlate: failed to set pin drive strength\n");
 
+        if (flags)
+                *flags = gpiospec->args[2] >> 16;
+
         return gpiospec->args[0];
 }
 
@@ -2833,7 +2836,7 @@ static __init void exynos5_gpiolib_init(void)
         }
 
         /* need to set base address for gpc4 */
-        exynos5_gpios_1[11].base = gpio_base1 + 0x2E0;
+        exynos5_gpios_1[20].base = gpio_base1 + 0x2E0;
 
         /* need to set base address for gpx */
         chip = &exynos5_gpios_1[21];