aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorThomas Kunze <thommycheck@gmx.de>2009-02-10 14:50:56 +0100
committerThomas Kunze <tkunze@tkunze-desktop.(none)>2009-11-27 21:07:21 +0100
commit9ca3dc805cd0d89c44f88b9a399061946781323a (patch)
treef00c3eae8adfb627a4daaae8a02c2883347bdcd8 /include/linux/mfd
parentSA1100: make gpio_to_irq and reverse a macro (diff)
downloadlinux-dev-9ca3dc805cd0d89c44f88b9a399061946781323a.tar.xz
linux-dev-9ca3dc805cd0d89c44f88b9a399061946781323a.zip
add gpiolib support to ucb1x00
The old access methods to the gpios will be removed when all users has been converted. (mainly ucb1x00-ts)
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/mcp.h1
-rw-r--r--include/linux/mfd/ucb1x00.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
index be95e09fd746..ee496708e38b 100644
--- a/include/linux/mfd/mcp.h
+++ b/include/linux/mfd/mcp.h
@@ -26,6 +26,7 @@ struct mcp {
dma_device_t dma_telco_rd;
dma_device_t dma_telco_wr;
struct device attached_device;
+ int gpio_base;
};
struct mcp_ops {
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index eac346336382..aa9c3789bed4 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -11,6 +11,8 @@
#define UCB1200_H
#include <linux/mfd/mcp.h>
+#include <linux/gpio.h>
+
#define UCB_IO_DATA 0x00
#define UCB_IO_DIR 0x01
@@ -123,6 +125,7 @@ struct ucb1x00 {
struct device dev;
struct list_head node;
struct list_head devs;
+ struct gpio_chip gpio;
};
struct ucb1x00_driver;