diff options
| author | José Miguel Gonçalves <jose.goncalves@inov.pt> | 2013-09-11 04:46:13 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-01-02 07:52:03 -0500 |
| commit | 035b2f7c8e64f2c7f87e1e11373b17c5dd1fbff4 (patch) | |
| tree | 6481a5d0244dd08f9e8c74ed4b446b50598b235c | |
| parent | 523639e6feb83892c15208027d7f0374cfcc1961 (diff) | |
ARM: S3C24XX: Fix configuration of gpio port sizes on S3C24XX.
Some GPIO line limits are incorrectly set which, for instance,
does not allow nRTS1 (GPH11) configuration on a S3C2416 chip.
Signed-off-by: José Miguel Gonçalves <jose.goncalves@inov.pt>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpio-samsung.c | 6 | ||||
| -rw-r--r-- | include/linux/platform_data/gpio-samsung-s3c24xx.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index be7b0bd4eed4..7138bb270c26 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c | |||
| @@ -1059,7 +1059,7 @@ struct samsung_gpio_chip s3c24xx_gpios[] = { | |||
| 1059 | .base = S3C2410_GPA(0), | 1059 | .base = S3C2410_GPA(0), |
| 1060 | .owner = THIS_MODULE, | 1060 | .owner = THIS_MODULE, |
| 1061 | .label = "GPIOA", | 1061 | .label = "GPIOA", |
| 1062 | .ngpio = 24, | 1062 | .ngpio = 27, |
| 1063 | .direction_input = s3c24xx_gpiolib_banka_input, | 1063 | .direction_input = s3c24xx_gpiolib_banka_input, |
| 1064 | .direction_output = s3c24xx_gpiolib_banka_output, | 1064 | .direction_output = s3c24xx_gpiolib_banka_output, |
| 1065 | }, | 1065 | }, |
| @@ -1068,7 +1068,7 @@ struct samsung_gpio_chip s3c24xx_gpios[] = { | |||
| 1068 | .base = S3C2410_GPB(0), | 1068 | .base = S3C2410_GPB(0), |
| 1069 | .owner = THIS_MODULE, | 1069 | .owner = THIS_MODULE, |
| 1070 | .label = "GPIOB", | 1070 | .label = "GPIOB", |
| 1071 | .ngpio = 16, | 1071 | .ngpio = 11, |
| 1072 | }, | 1072 | }, |
| 1073 | }, { | 1073 | }, { |
| 1074 | .chip = { | 1074 | .chip = { |
| @@ -1113,7 +1113,7 @@ struct samsung_gpio_chip s3c24xx_gpios[] = { | |||
| 1113 | .base = S3C2410_GPH(0), | 1113 | .base = S3C2410_GPH(0), |
| 1114 | .owner = THIS_MODULE, | 1114 | .owner = THIS_MODULE, |
| 1115 | .label = "GPIOH", | 1115 | .label = "GPIOH", |
| 1116 | .ngpio = 11, | 1116 | .ngpio = 15, |
| 1117 | }, | 1117 | }, |
| 1118 | }, | 1118 | }, |
| 1119 | /* GPIOS for the S3C2443 and later devices. */ | 1119 | /* GPIOS for the S3C2443 and later devices. */ |
diff --git a/include/linux/platform_data/gpio-samsung-s3c24xx.h b/include/linux/platform_data/gpio-samsung-s3c24xx.h index 5ce750c84a14..79b3a0e44955 100644 --- a/include/linux/platform_data/gpio-samsung-s3c24xx.h +++ b/include/linux/platform_data/gpio-samsung-s3c24xx.h | |||
| @@ -23,17 +23,17 @@ | |||
| 23 | * 2410 2412 2440 2443 2416 | 23 | * 2410 2412 2440 2443 2416 |
| 24 | * 2442 | 24 | * 2442 |
| 25 | * ---- ---- ---- ---- ---- | 25 | * ---- ---- ---- ---- ---- |
| 26 | * A 23 22 25 16 25 | 26 | * A 23 22 25 16 27 |
| 27 | * B 11 11 11 11 9 | 27 | * B 11 11 11 11 11 |
| 28 | * C 16 15 16 16 16 | 28 | * C 16 16 16 16 16 |
| 29 | * D 16 16 16 16 16 | 29 | * D 16 16 16 16 16 |
| 30 | * E 16 16 16 16 16 | 30 | * E 16 16 16 16 16 |
| 31 | * F 8 8 8 8 8 | 31 | * F 8 8 8 8 8 |
| 32 | * G 16 16 16 16 8 | 32 | * G 16 16 16 16 8 |
| 33 | * H 11 11 9 15 15 | 33 | * H 11 11 11 15 15 |
| 34 | * J -- -- 13 16 -- | 34 | * J -- -- 13 16 -- |
| 35 | * K -- -- -- -- 16 | 35 | * K -- -- -- -- 16 |
| 36 | * L -- -- -- 15 7 | 36 | * L -- -- -- 15 14 |
| 37 | * M -- -- -- 2 2 | 37 | * M -- -- -- 2 2 |
| 38 | */ | 38 | */ |
| 39 | 39 | ||
