summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-05-21 23:10:21 +0200
committerBen Dooks <ben-linux@fluff.org>2009-05-21 23:10:21 +0200
commit99ae99533a059750c4b0f76295625b8ac5ea751a (patch)
tree281129684e730ccd5b5b1e1fbbd9b83f3fa18986 /arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
parent[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel (diff)
parent[ARM] S3C24XX: GPIO: Change usb-simtec.c to use gpiolib. (diff)
downloadlinux-99ae99533a059750c4b0f76295625b8ac5ea751a.tar.xz
linux-99ae99533a059750c4b0f76295625b8ac5ea751a.zip
[ARM] S3C24XX: Merge devel-gpio
Merge branch 'devel-gpio' into for-rmk-devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c')
-rw-r--r--arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c b/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
index 8fccd4e549f0..f34d0fc69ad8 100644
--- a/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
+++ b/arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c
@@ -22,16 +22,16 @@ void s3c24xx_spi_gpiocfg_bus1_gpg5_6_7(struct s3c2410_spi_info *spi,
int enable)
{
if (enable) {
- s3c2410_gpio_cfgpin(S3C2410_GPG7, S3C2410_GPG7_SPICLK1);
- s3c2410_gpio_cfgpin(S3C2410_GPG6, S3C2410_GPG6_SPIMOSI1);
- s3c2410_gpio_cfgpin(S3C2410_GPG5, S3C2410_GPG5_SPIMISO1);
- s3c2410_gpio_pullup(S3C2410_GPG5, 0);
- s3c2410_gpio_pullup(S3C2410_GPG6, 0);
+ s3c2410_gpio_cfgpin(S3C2410_GPG(7), S3C2410_GPG7_SPICLK1);
+ s3c2410_gpio_cfgpin(S3C2410_GPG(6), S3C2410_GPG6_SPIMOSI1);
+ s3c2410_gpio_cfgpin(S3C2410_GPG(5), S3C2410_GPG5_SPIMISO1);
+ s3c2410_gpio_pullup(S3C2410_GPG(5), 0);
+ s3c2410_gpio_pullup(S3C2410_GPG(6), 0);
} else {
- s3c2410_gpio_cfgpin(S3C2410_GPG7, S3C2410_GPIO_INPUT);
- s3c2410_gpio_cfgpin(S3C2410_GPG5, S3C2410_GPIO_INPUT);
- s3c2410_gpio_pullup(S3C2410_GPG5, 1);
- s3c2410_gpio_pullup(S3C2410_GPG6, 1);
- s3c2410_gpio_pullup(S3C2410_GPG7, 1);
+ s3c2410_gpio_cfgpin(S3C2410_GPG(7), S3C2410_GPIO_INPUT);
+ s3c2410_gpio_cfgpin(S3C2410_GPG(5), S3C2410_GPIO_INPUT);
+ s3c2410_gpio_pullup(S3C2410_GPG(5), 1);
+ s3c2410_gpio_pullup(S3C2410_GPG(6), 1);
+ s3c2410_gpio_pullup(S3C2410_GPG(7), 1);
}
}