diff options
Diffstat (limited to 'include/linux/mfd/stmpe.h')
-rw-r--r-- | include/linux/mfd/stmpe.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/mfd/stmpe.h b/include/linux/mfd/stmpe.h index f742b6717d52..c9d869027300 100644 --- a/include/linux/mfd/stmpe.h +++ b/include/linux/mfd/stmpe.h | |||
@@ -118,20 +118,6 @@ extern int stmpe_disable(struct stmpe *stmpe, unsigned int blocks); | |||
118 | #define STMPE_GPIO_NOREQ_811_TOUCH (0xf0) | 118 | #define STMPE_GPIO_NOREQ_811_TOUCH (0xf0) |
119 | 119 | ||
120 | /** | 120 | /** |
121 | * struct stmpe_gpio_platform_data - STMPE GPIO platform data | ||
122 | * @norequest_mask: bitmask specifying which GPIOs should _not_ be | ||
123 | * requestable due to different usage (e.g. touch, keypad) | ||
124 | * STMPE_GPIO_NOREQ_* macros can be used here. | ||
125 | * @setup: board specific setup callback. | ||
126 | * @remove: board specific remove callback | ||
127 | */ | ||
128 | struct stmpe_gpio_platform_data { | ||
129 | unsigned norequest_mask; | ||
130 | void (*setup)(struct stmpe *stmpe, unsigned gpio_base); | ||
131 | void (*remove)(struct stmpe *stmpe, unsigned gpio_base); | ||
132 | }; | ||
133 | |||
134 | /** | ||
135 | * struct stmpe_ts_platform_data - stmpe811 touch screen controller platform | 121 | * struct stmpe_ts_platform_data - stmpe811 touch screen controller platform |
136 | * data | 122 | * data |
137 | * @sample_time: ADC converstion time in number of clock. | 123 | * @sample_time: ADC converstion time in number of clock. |
@@ -182,7 +168,6 @@ struct stmpe_ts_platform_data { | |||
182 | * @irq_over_gpio: true if gpio is used to get irq | 168 | * @irq_over_gpio: true if gpio is used to get irq |
183 | * @irq_gpio: gpio number over which irq will be requested (significant only if | 169 | * @irq_gpio: gpio number over which irq will be requested (significant only if |
184 | * irq_over_gpio is true) | 170 | * irq_over_gpio is true) |
185 | * @gpio: GPIO-specific platform data | ||
186 | * @ts: touchscreen-specific platform data | 171 | * @ts: touchscreen-specific platform data |
187 | */ | 172 | */ |
188 | struct stmpe_platform_data { | 173 | struct stmpe_platform_data { |
@@ -194,7 +179,6 @@ struct stmpe_platform_data { | |||
194 | int irq_gpio; | 179 | int irq_gpio; |
195 | int autosleep_timeout; | 180 | int autosleep_timeout; |
196 | 181 | ||
197 | struct stmpe_gpio_platform_data *gpio; | ||
198 | struct stmpe_ts_platform_data *ts; | 182 | struct stmpe_ts_platform_data *ts; |
199 | }; | 183 | }; |
200 | 184 | ||