summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2011-01-12 17:00:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 08:03:13 -0800
commit7637c9259f7b6dd841471ccf1120d484b7364f99 (patch)
tree1284edad0917aafa6b9fab7e2f98f460b671d2dc /include/linux
parent1b912c1bca5c162e611384fe7d39c916e081701a (diff)
downloadlinux-3.10-7637c9259f7b6dd841471ccf1120d484b7364f99.tar.gz
linux-3.10-7637c9259f7b6dd841471ccf1120d484b7364f99.tar.bz2
linux-3.10-7637c9259f7b6dd841471ccf1120d484b7364f99.zip
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
Drop the old geode_gpio crud, as well as the raw outl() calls; instead, use the Linux GPIO API where possible, and the cs5535_gpio API in other places. Note that we don't actually clean up the driver properly yet (once loaded, it always remains loaded). That'll come later.. This patch is necessary for building the driver. Signed-off-by: Andres Salomon <dilinger@queued.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cs5535.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index 213cc50b580..6fe2114f8ad 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -103,11 +103,15 @@ static inline int cs5535_has_vsa2(void)
#define GPIO_POSITIVE_EDGE_STS 0x48
#define GPIO_NEGATIVE_EDGE_STS 0x4C
+#define GPIO_FLTR7_AMOUNT 0xD8
+
#define GPIO_MAP_X 0xE0
#define GPIO_MAP_Y 0xE4
#define GPIO_MAP_Z 0xE8
#define GPIO_MAP_W 0xEC
+#define GPIO_FE7_SEL 0xF7
+
void cs5535_gpio_set(unsigned offset, unsigned int reg);
void cs5535_gpio_clear(unsigned offset, unsigned int reg);
int cs5535_gpio_isset(unsigned offset, unsigned int reg);