diff options
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/wm831x/core.h | 3 | ||||
| -rw-r--r-- | include/linux/mfd/wm831x/pdata.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h index 44acdb25681b..ed8fe0d04097 100644 --- a/include/linux/mfd/wm831x/core.h +++ b/include/linux/mfd/wm831x/core.h | |||
| @@ -371,6 +371,8 @@ struct wm831x { | |||
| 371 | int irq_masks_cur[WM831X_NUM_IRQ_REGS]; /* Currently active value */ | 371 | int irq_masks_cur[WM831X_NUM_IRQ_REGS]; /* Currently active value */ |
| 372 | int irq_masks_cache[WM831X_NUM_IRQ_REGS]; /* Cached hardware value */ | 372 | int irq_masks_cache[WM831X_NUM_IRQ_REGS]; /* Cached hardware value */ |
| 373 | 373 | ||
| 374 | bool soft_shutdown; | ||
| 375 | |||
| 374 | /* Chip revision based flags */ | 376 | /* Chip revision based flags */ |
| 375 | unsigned has_gpio_ena:1; /* Has GPIO enable bit */ | 377 | unsigned has_gpio_ena:1; /* Has GPIO enable bit */ |
| 376 | unsigned has_cs_sts:1; /* Has current sink status bit */ | 378 | unsigned has_cs_sts:1; /* Has current sink status bit */ |
| @@ -409,6 +411,7 @@ int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg, | |||
| 409 | int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq); | 411 | int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq); |
| 410 | void wm831x_device_exit(struct wm831x *wm831x); | 412 | void wm831x_device_exit(struct wm831x *wm831x); |
| 411 | int wm831x_device_suspend(struct wm831x *wm831x); | 413 | int wm831x_device_suspend(struct wm831x *wm831x); |
| 414 | void wm831x_device_shutdown(struct wm831x *wm831x); | ||
| 412 | int wm831x_irq_init(struct wm831x *wm831x, int irq); | 415 | int wm831x_irq_init(struct wm831x *wm831x, int irq); |
| 413 | void wm831x_irq_exit(struct wm831x *wm831x); | 416 | void wm831x_irq_exit(struct wm831x *wm831x); |
| 414 | void wm831x_auxadc_init(struct wm831x *wm831x); | 417 | void wm831x_auxadc_init(struct wm831x *wm831x); |
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index 0ba24599fe51..1d7a3f7b3b5d 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h | |||
| @@ -123,6 +123,9 @@ struct wm831x_pdata { | |||
| 123 | /** Disable the touchscreen */ | 123 | /** Disable the touchscreen */ |
| 124 | bool disable_touch; | 124 | bool disable_touch; |
| 125 | 125 | ||
| 126 | /** The driver should initiate a power off sequence during shutdown */ | ||
| 127 | bool soft_shutdown; | ||
| 128 | |||
| 126 | int irq_base; | 129 | int irq_base; |
| 127 | int gpio_base; | 130 | int gpio_base; |
| 128 | int gpio_defaults[WM831X_GPIO_NUM]; | 131 | int gpio_defaults[WM831X_GPIO_NUM]; |
