diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-10-28 06:06:56 -0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-11-25 11:18:56 -0500 |
| commit | 90f2d0f7bf069b1a2798156b7dcc8e7d1e874406 (patch) | |
| tree | 2e061f56b493848c147af369fcc7d0dd9a1b6373 /include/linux/mfd | |
| parent | 47958c5ab4035bd91f05598f76a61cd9f7f2934c (diff) | |
mfd: tc3589x: get rid of static base
The TC3589x driver is now a device tree-only driver, so we want
only dynamic IRQs and GPIO numbers from the tc3589x, no static
assignments.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tc3589x.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/mfd/tc3589x.h b/include/linux/mfd/tc3589x.h index e6088c2e2092..e1c12d84c26a 100644 --- a/include/linux/mfd/tc3589x.h +++ b/include/linux/mfd/tc3589x.h | |||
| @@ -164,13 +164,10 @@ struct tc3589x_keypad_platform_data { | |||
| 164 | 164 | ||
| 165 | /** | 165 | /** |
| 166 | * struct tc3589x_gpio_platform_data - TC3589x GPIO platform data | 166 | * struct tc3589x_gpio_platform_data - TC3589x GPIO platform data |
| 167 | * @gpio_base: first gpio number assigned to TC3589x. A maximum of | ||
| 168 | * %TC3589x_NR_GPIOS GPIOs will be allocated. | ||
| 169 | * @setup: callback for board-specific initialization | 167 | * @setup: callback for board-specific initialization |
| 170 | * @remove: callback for board-specific teardown | 168 | * @remove: callback for board-specific teardown |
| 171 | */ | 169 | */ |
| 172 | struct tc3589x_gpio_platform_data { | 170 | struct tc3589x_gpio_platform_data { |
| 173 | int gpio_base; | ||
| 174 | void (*setup)(struct tc3589x *tc3589x, unsigned gpio_base); | 171 | void (*setup)(struct tc3589x *tc3589x, unsigned gpio_base); |
| 175 | void (*remove)(struct tc3589x *tc3589x, unsigned gpio_base); | 172 | void (*remove)(struct tc3589x *tc3589x, unsigned gpio_base); |
| 176 | }; | 173 | }; |
| @@ -178,18 +175,13 @@ struct tc3589x_gpio_platform_data { | |||
| 178 | /** | 175 | /** |
| 179 | * struct tc3589x_platform_data - TC3589x platform data | 176 | * struct tc3589x_platform_data - TC3589x platform data |
| 180 | * @block: bitmask of blocks to enable (use TC3589x_BLOCK_*) | 177 | * @block: bitmask of blocks to enable (use TC3589x_BLOCK_*) |
| 181 | * @irq_base: base IRQ number. %TC3589x_NR_IRQS irqs will be used. | ||
| 182 | * @gpio: GPIO-specific platform data | 178 | * @gpio: GPIO-specific platform data |
| 183 | * @keypad: keypad-specific platform data | 179 | * @keypad: keypad-specific platform data |
| 184 | */ | 180 | */ |
| 185 | struct tc3589x_platform_data { | 181 | struct tc3589x_platform_data { |
| 186 | unsigned int block; | 182 | unsigned int block; |
| 187 | int irq_base; | ||
| 188 | struct tc3589x_gpio_platform_data *gpio; | 183 | struct tc3589x_gpio_platform_data *gpio; |
| 189 | const struct tc3589x_keypad_platform_data *keypad; | 184 | const struct tc3589x_keypad_platform_data *keypad; |
| 190 | }; | 185 | }; |
| 191 | 186 | ||
| 192 | #define TC3589x_NR_GPIOS 24 | ||
| 193 | #define TC3589x_NR_IRQS TC3589x_INT_GPIO(TC3589x_NR_GPIOS) | ||
| 194 | |||
| 195 | #endif | 187 | #endif |
