diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 12 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/gpio.c | 13 |
2 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h index f50c2a5f7ab3..f453c4f2cb8e 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio-fns.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio-fns.h | |||
| @@ -97,18 +97,6 @@ extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
| 97 | 97 | ||
| 98 | extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to); | 98 | extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to); |
| 99 | 99 | ||
| 100 | /* s3c2410_gpio_getpull | ||
| 101 | * | ||
| 102 | * Read the state of the pull-up on a given pin | ||
| 103 | * | ||
| 104 | * return: | ||
| 105 | * < 0 => error code | ||
| 106 | * 0 => enabled | ||
| 107 | * 1 => disabled | ||
| 108 | */ | ||
| 109 | |||
| 110 | extern int s3c2410_gpio_getpull(unsigned int pin); | ||
| 111 | |||
| 112 | extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to); | 100 | extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to); |
| 113 | 101 | ||
| 114 | extern unsigned int s3c2410_gpio_getpin(unsigned int pin); | 102 | extern unsigned int s3c2410_gpio_getpin(unsigned int pin); |
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index 0b3b2cb228ab..9b3d74c186fc 100644 --- a/arch/arm/plat-s3c24xx/gpio.c +++ b/arch/arm/plat-s3c24xx/gpio.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | |||
| 24 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 25 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| @@ -75,18 +74,6 @@ void s3c2410_gpio_pullup(unsigned int pin, unsigned int to) | |||
| 75 | 74 | ||
| 76 | EXPORT_SYMBOL(s3c2410_gpio_pullup); | 75 | EXPORT_SYMBOL(s3c2410_gpio_pullup); |
| 77 | 76 | ||
| 78 | int s3c2410_gpio_getpull(unsigned int pin) | ||
| 79 | { | ||
| 80 | void __iomem *base = S3C24XX_GPIO_BASE(pin); | ||
| 81 | unsigned long offs = S3C2410_GPIO_OFFSET(pin); | ||
| 82 | |||
| 83 | if (pin < S3C2410_GPIO_BANKB) | ||
| 84 | return -EINVAL; | ||
| 85 | |||
| 86 | return (__raw_readl(base + 0x08) & (1L << offs)) ? 1 : 0; | ||
| 87 | } | ||
| 88 | |||
| 89 | EXPORT_SYMBOL(s3c2410_gpio_getpull); | ||
| 90 | 77 | ||
| 91 | void s3c2410_gpio_setpin(unsigned int pin, unsigned int to) | 78 | void s3c2410_gpio_setpin(unsigned int pin, unsigned int to) |
| 92 | { | 79 | { |
