diff options
Diffstat (limited to 'drivers/gpio/gpio-samsung.c')
-rw-r--r-- | drivers/gpio/gpio-samsung.c | 31 |
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, | |||
230 | * @chip: The gpio chip that is being configured. | 230 | * @chip: The gpio chip that is being configured. |
231 | * @off: The offset for the GPIO being configured. | 231 | * @off: The offset for the GPIO being configured. |
232 | * | 232 | * |
233 | * The reverse of samsung_gpio_setcfg_2bit(). Will return a value whicg | 233 | * The reverse of samsung_gpio_setcfg_2bit(). Will return a value which |
234 | * could be directly passed back to samsung_gpio_setcfg_2bit(), from the | 234 | * could be directly passed back to samsung_gpio_setcfg_2bit(), from the |
235 | * S3C_GPIO_SPECIAL() macro. | 235 | * S3C_GPIO_SPECIAL() macro. |
236 | */ | 236 | */ |
@@ -467,33 +467,42 @@ static struct samsung_gpio_cfg s5p64x0_gpio_cfg_rbank = { | |||
467 | #endif | 467 | #endif |
468 | 468 | ||
469 | static struct samsung_gpio_cfg samsung_gpio_cfgs[] = { | 469 | static struct samsung_gpio_cfg samsung_gpio_cfgs[] = { |
470 | { | 470 | [0] = { |
471 | .cfg_eint = 0x0, | 471 | .cfg_eint = 0x0, |
472 | }, { | 472 | }, |
473 | [1] = { | ||
473 | .cfg_eint = 0x3, | 474 | .cfg_eint = 0x3, |
474 | }, { | 475 | }, |
476 | [2] = { | ||
475 | .cfg_eint = 0x7, | 477 | .cfg_eint = 0x7, |
476 | }, { | 478 | }, |
479 | [3] = { | ||
477 | .cfg_eint = 0xF, | 480 | .cfg_eint = 0xF, |
478 | }, { | 481 | }, |
482 | [4] = { | ||
479 | .cfg_eint = 0x0, | 483 | .cfg_eint = 0x0, |
480 | .set_config = samsung_gpio_setcfg_2bit, | 484 | .set_config = samsung_gpio_setcfg_2bit, |
481 | .get_config = samsung_gpio_getcfg_2bit, | 485 | .get_config = samsung_gpio_getcfg_2bit, |
482 | }, { | 486 | }, |
487 | [5] = { | ||
483 | .cfg_eint = 0x2, | 488 | .cfg_eint = 0x2, |
484 | .set_config = samsung_gpio_setcfg_2bit, | 489 | .set_config = samsung_gpio_setcfg_2bit, |
485 | .get_config = samsung_gpio_getcfg_2bit, | 490 | .get_config = samsung_gpio_getcfg_2bit, |
486 | }, { | 491 | }, |
492 | [6] = { | ||
487 | .cfg_eint = 0x3, | 493 | .cfg_eint = 0x3, |
488 | .set_config = samsung_gpio_setcfg_2bit, | 494 | .set_config = samsung_gpio_setcfg_2bit, |
489 | .get_config = samsung_gpio_getcfg_2bit, | 495 | .get_config = samsung_gpio_getcfg_2bit, |
490 | }, { | 496 | }, |
497 | [7] = { | ||
491 | .set_config = samsung_gpio_setcfg_2bit, | 498 | .set_config = samsung_gpio_setcfg_2bit, |
492 | .get_config = samsung_gpio_getcfg_2bit, | 499 | .get_config = samsung_gpio_getcfg_2bit, |
493 | }, { | 500 | }, |
501 | [8] = { | ||
494 | .set_pull = exynos4_gpio_setpull, | 502 | .set_pull = exynos4_gpio_setpull, |
495 | .get_pull = exynos4_gpio_getpull, | 503 | .get_pull = exynos4_gpio_getpull, |
496 | }, { | 504 | }, |
505 | [9] = { | ||
497 | .cfg_eint = 0x3, | 506 | .cfg_eint = 0x3, |
498 | .set_pull = exynos4_gpio_setpull, | 507 | .set_pull = exynos4_gpio_setpull, |
499 | .get_pull = exynos4_gpio_getpull, | 508 | .get_pull = exynos4_gpio_getpull, |