diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-05-08 17:16:34 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-05-23 04:41:01 -0400 |
commit | 9e9dc7d9597bd6881b3e7ae6ae3d710319605c47 (patch) | |
tree | 86a55e9ccf8388a805eaaa4fed10b472590af6b4 /include/linux/mfd | |
parent | 9c9e321455fb806108f9dbb1872bacfd42c6002b (diff) |
mfd: stmpe: root out static GPIO and IRQ assignments
The only platform using the STMPE expander now boots from
device tree using all-dynamic GPIO and IRQ number assignments, so
remove the mechanism to pass this from the device tree entirely.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/stmpe.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index 980898620e57..575a86c7fcbd 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h | |||
@@ -76,7 +76,6 @@ struct stmpe_client_info; | |||
76 | * @regs: list of addresses of registers which are at different addresses on | 76 | * @regs: list of addresses of registers which are at different addresses on |
77 | * different variants. Indexed by one of STMPE_IDX_*. | 77 | * different variants. Indexed by one of STMPE_IDX_*. |
78 | * @irq: irq number for stmpe | 78 | * @irq: irq number for stmpe |
79 | * @irq_base: starting IRQ number for internal IRQs | ||
80 | * @num_gpios: number of gpios, differs for variants | 79 | * @num_gpios: number of gpios, differs for variants |
81 | * @ier: cache of IER registers for bus_lock | 80 | * @ier: cache of IER registers for bus_lock |
82 | * @oldier: cache of IER registers for bus_lock | 81 | * @oldier: cache of IER registers for bus_lock |
@@ -96,7 +95,6 @@ struct stmpe { | |||
96 | const u8 *regs; | 95 | const u8 *regs; |
97 | 96 | ||
98 | int irq; | 97 | int irq; |
99 | int irq_base; | ||
100 | int num_gpios; | 98 | int num_gpios; |
101 | u8 ier[2]; | 99 | u8 ier[2]; |
102 | u8 oldier[2]; | 100 | u8 oldier[2]; |
@@ -137,8 +135,6 @@ struct stmpe_keypad_platform_data { | |||
137 | 135 | ||
138 | /** | 136 | /** |
139 | * struct stmpe_gpio_platform_data - STMPE GPIO platform data | 137 | * struct stmpe_gpio_platform_data - STMPE GPIO platform data |
140 | * @gpio_base: first gpio number assigned. A maximum of | ||
141 | * %STMPE_NR_GPIOS GPIOs will be allocated. | ||
142 | * @norequest_mask: bitmask specifying which GPIOs should _not_ be | 138 | * @norequest_mask: bitmask specifying which GPIOs should _not_ be |
143 | * requestable due to different usage (e.g. touch, keypad) | 139 | * requestable due to different usage (e.g. touch, keypad) |
144 | * STMPE_GPIO_NOREQ_* macros can be used here. | 140 | * STMPE_GPIO_NOREQ_* macros can be used here. |
@@ -146,7 +142,6 @@ struct stmpe_keypad_platform_data { | |||
146 | * @remove: board specific remove callback | 142 | * @remove: board specific remove callback |
147 | */ | 143 | */ |
148 | struct stmpe_gpio_platform_data { | 144 | struct stmpe_gpio_platform_data { |
149 | int gpio_base; | ||
150 | unsigned norequest_mask; | 145 | unsigned norequest_mask; |
151 | void (*setup)(struct stmpe *stmpe, unsigned gpio_base); | 146 | void (*setup)(struct stmpe *stmpe, unsigned gpio_base); |
152 | void (*remove)(struct stmpe *stmpe, unsigned gpio_base); | 147 | void (*remove)(struct stmpe *stmpe, unsigned gpio_base); |
@@ -200,8 +195,6 @@ struct stmpe_ts_platform_data { | |||
200 | * @irq_trigger: IRQ trigger to use for the interrupt to the host | 195 | * @irq_trigger: IRQ trigger to use for the interrupt to the host |
201 | * @autosleep: bool to enable/disable stmpe autosleep | 196 | * @autosleep: bool to enable/disable stmpe autosleep |
202 | * @autosleep_timeout: inactivity timeout in milliseconds for autosleep | 197 | * @autosleep_timeout: inactivity timeout in milliseconds for autosleep |
203 | * @irq_base: base IRQ number. %STMPE_NR_IRQS irqs will be used, or | ||
204 | * %STMPE_NR_INTERNAL_IRQS if the GPIO driver is not used. | ||
205 | * @irq_over_gpio: true if gpio is used to get irq | 198 | * @irq_over_gpio: true if gpio is used to get irq |
206 | * @irq_gpio: gpio number over which irq will be requested (significant only if | 199 | * @irq_gpio: gpio number over which irq will be requested (significant only if |
207 | * irq_over_gpio is true) | 200 | * irq_over_gpio is true) |
@@ -212,7 +205,6 @@ struct stmpe_ts_platform_data { | |||
212 | struct stmpe_platform_data { | 205 | struct stmpe_platform_data { |
213 | int id; | 206 | int id; |
214 | unsigned int blocks; | 207 | unsigned int blocks; |
215 | int irq_base; | ||
216 | unsigned int irq_trigger; | 208 | unsigned int irq_trigger; |
217 | bool autosleep; | 209 | bool autosleep; |
218 | bool irq_over_gpio; | 210 | bool irq_over_gpio; |
@@ -224,10 +216,4 @@ struct stmpe_platform_data { | |||
224 | struct stmpe_ts_platform_data *ts; | 216 | struct stmpe_ts_platform_data *ts; |
225 | }; | 217 | }; |
226 | 218 | ||
227 | #define STMPE_NR_INTERNAL_IRQS 9 | ||
228 | #define STMPE_INT_GPIO(x) (STMPE_NR_INTERNAL_IRQS + (x)) | ||
229 | |||
230 | #define STMPE_NR_GPIOS 24 | ||
231 | #define STMPE_NR_IRQS STMPE_INT_GPIO(STMPE_NR_GPIOS) | ||
232 | |||
233 | #endif | 219 | #endif |