diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-04-30 06:30:35 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-05 20:25:50 -0400 |
commit | 9bbb851c7079ff670ba3fe6c7ce93bb5daa9a694 (patch) | |
tree | 0b6ddca771a718fb52084317208b2a111ad3b8d6 /arch/arm/plat-samsung | |
parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) |
ARM: S3C24XX: Add initial s3c_gpio configuration code
Add support for s3c_gpio_setcfg() and s3c_gpio_setpull() implementations
to get ready for removal of the specific code being used by s3c24xx.
Also rename the s3c_gpio_setcfg_s3c24xx_banka to s3c_gpio_setcfg_s3c24xx_a
as seen in the header file to correct a build warning.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/gpio-config.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-core.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/gpio-config.c b/arch/arm/plat-samsung/gpio-config.c index 44a84e896546..c5832824e198 100644 --- a/arch/arm/plat-samsung/gpio-config.c +++ b/arch/arm/plat-samsung/gpio-config.c | |||
@@ -61,8 +61,8 @@ int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull) | |||
61 | EXPORT_SYMBOL(s3c_gpio_setpull); | 61 | EXPORT_SYMBOL(s3c_gpio_setpull); |
62 | 62 | ||
63 | #ifdef CONFIG_S3C_GPIO_CFG_S3C24XX | 63 | #ifdef CONFIG_S3C_GPIO_CFG_S3C24XX |
64 | int s3c_gpio_setcfg_s3c24xx_banka(struct s3c_gpio_chip *chip, | 64 | int s3c_gpio_setcfg_s3c24xx_a(struct s3c_gpio_chip *chip, |
65 | unsigned int off, unsigned int cfg) | 65 | unsigned int off, unsigned int cfg) |
66 | { | 66 | { |
67 | void __iomem *reg = chip->base; | 67 | void __iomem *reg = chip->base; |
68 | unsigned int shift = off; | 68 | unsigned int shift = off; |
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h index 49ff406a7066..f0584f26d493 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-core.h +++ b/arch/arm/plat-samsung/include/plat/gpio-core.h | |||
@@ -108,6 +108,9 @@ extern void samsung_gpiolib_add_4bit2_chips(struct s3c_gpio_chip *chip, | |||
108 | extern void samsung_gpiolib_add_4bit(struct s3c_gpio_chip *chip); | 108 | extern void samsung_gpiolib_add_4bit(struct s3c_gpio_chip *chip); |
109 | extern void samsung_gpiolib_add_4bit2(struct s3c_gpio_chip *chip); | 109 | extern void samsung_gpiolib_add_4bit2(struct s3c_gpio_chip *chip); |
110 | 110 | ||
111 | /* exported for core SoC support to change */ | ||
112 | extern struct s3c_gpio_cfg s3c24xx_gpiocfg_default; | ||
113 | |||
111 | #ifdef CONFIG_S3C_GPIO_TRACK | 114 | #ifdef CONFIG_S3C_GPIO_TRACK |
112 | extern struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END]; | 115 | extern struct s3c_gpio_chip *s3c_gpios[S3C_GPIO_END]; |
113 | 116 | ||