diff options
author | Thomas Kunze <thommycheck@gmx.de> | 2009-02-10 08:50:56 -0500 |
---|---|---|
committer | Thomas Kunze <tkunze@tkunze-desktop.(none)> | 2009-11-27 15:07:21 -0500 |
commit | 9ca3dc805cd0d89c44f88b9a399061946781323a (patch) | |
tree | f00c3eae8adfb627a4daaae8a02c2883347bdcd8 /include/linux/mfd | |
parent | cc647172795713e013f8de4bcdf91860e9e87bff (diff) |
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.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/ucb1x00.h | 3 |
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 { | |||
26 | dma_device_t dma_telco_rd; | 26 | dma_device_t dma_telco_rd; |
27 | dma_device_t dma_telco_wr; | 27 | dma_device_t dma_telco_wr; |
28 | struct device attached_device; | 28 | struct device attached_device; |
29 | int gpio_base; | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | struct mcp_ops { | 32 | 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 @@ | |||
11 | #define UCB1200_H | 11 | #define UCB1200_H |
12 | 12 | ||
13 | #include <linux/mfd/mcp.h> | 13 | #include <linux/mfd/mcp.h> |
14 | #include <linux/gpio.h> | ||
15 | |||
14 | #define UCB_IO_DATA 0x00 | 16 | #define UCB_IO_DATA 0x00 |
15 | #define UCB_IO_DIR 0x01 | 17 | #define UCB_IO_DIR 0x01 |
16 | 18 | ||
@@ -123,6 +125,7 @@ struct ucb1x00 { | |||
123 | struct device dev; | 125 | struct device dev; |
124 | struct list_head node; | 126 | struct list_head node; |
125 | struct list_head devs; | 127 | struct list_head devs; |
128 | struct gpio_chip gpio; | ||
126 | }; | 129 | }; |
127 | 130 | ||
128 | struct ucb1x00_driver; | 131 | struct ucb1x00_driver; |