From 6e6551012775e2aa05117e6a462523d923a89d68 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 28 Jan 2008 13:01:23 +0100
Subject: [PATCH] --- yaml --- r: 77492 b: refs/heads/master c:
 bb6d9b56c1d5c1cbff39b7c337c900e2b3d8387a h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/plat-s3c24xx/gpio.c            | 13 +++++++++++++
 trunk/include/asm-arm/arch-s3c2410/hardware.h | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 36be97a0529b..f2f5f030ddf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f613be4a9b6d680772b0a52a43a4a94d8e131b6
+refs/heads/master: bb6d9b56c1d5c1cbff39b7c337c900e2b3d8387a
diff --git a/trunk/arch/arm/plat-s3c24xx/gpio.c b/trunk/arch/arm/plat-s3c24xx/gpio.c
index ec3a09c4d181..7cc6faec25d9 100644
--- a/trunk/arch/arm/plat-s3c24xx/gpio.c
+++ b/trunk/arch/arm/plat-s3c24xx/gpio.c
@@ -122,6 +122,19 @@ void s3c2410_gpio_pullup(unsigned int pin, unsigned int to)
 
 EXPORT_SYMBOL(s3c2410_gpio_pullup);
 
+int s3c2410_gpio_getpull(unsigned int pin)
+{
+	void __iomem *base = S3C24XX_GPIO_BASE(pin);
+	unsigned long offs = S3C2410_GPIO_OFFSET(pin);
+
+	if (pin < S3C2410_GPIO_BANKB)
+		return -EINVAL;
+
+	return (__raw_readl(base + 0x08) & (1L << offs)) ? 1 : 0;
+}
+
+EXPORT_SYMBOL(s3c2410_gpio_getpull);
+
 void s3c2410_gpio_setpin(unsigned int pin, unsigned int to)
 {
 	void __iomem *base = S3C24XX_GPIO_BASE(pin);
diff --git a/trunk/include/asm-arm/arch-s3c2410/hardware.h b/trunk/include/asm-arm/arch-s3c2410/hardware.h
index faeaba514ffe..20509e4540f6 100644
--- a/trunk/include/asm-arm/arch-s3c2410/hardware.h
+++ b/trunk/include/asm-arm/arch-s3c2410/hardware.h
@@ -87,6 +87,18 @@ extern int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on,
 
 extern void s3c2410_gpio_pullup(unsigned int pin, unsigned int to);
 
+/* s3c2410_gpio_getpull
+ *
+ * Read the state of the pull-up on a given pin
+ *
+ * return:
+ *	< 0 => error code
+ *	  0 => enabled
+ *	  1 => disabled
+*/
+
+extern int s3c2410_gpio_getpull(unsigned int pin);
+
 extern void s3c2410_gpio_setpin(unsigned int pin, unsigned int to);
 
 extern unsigned int s3c2410_gpio_getpin(unsigned int pin);