Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / gpio / gpio-samsung.c

diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index 421f6af0f99582022f395da0f2e0d9f2d6523b83..7bb00448e13d2cd30140b06c9c1ca635708d9bbd 100644 (file)
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -2452,6 +2452,12 @@ static struct samsung_gpio_chip exynos5_gpios_1[] = {
                        .ngpio  = EXYNOS5_GPIO_C3_NR,
                        .label  = "GPC3",
                },
+       }, {
+               .chip   = {
+                       .base   = EXYNOS5_GPC4(0),
+                       .ngpio  = EXYNOS5_GPIO_C4_NR,
+                       .label  = "GPC4",
+               },
        }, {
                .chip   = {
                        .base   = EXYNOS5_GPD0(0),
@@ -2826,8 +2832,11 @@ static __init void exynos5_gpiolib_init(void)
                goto err_ioremap1;
        }
 
+       /* need to set base address for gpc4 */
+       exonys5_gpios_1[11].base = gpio_base1 + 0x2E0;
+
        /* need to set base address for gpx */
-       chip = &exynos5_gpios_1[20];
+       chip = &exynos5_gpios_1[21];
        gpx_base = gpio_base1 + 0xC00;
        for (i = 0; i < 4; i++, chip++, gpx_base += 0x20)
                chip->base = gpx_base;