diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-05-09 07:08:08 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-05-16 18:42:33 -0400 |
| commit | 0b8ebdb18888c55588b932f4f564b9c9529de627 (patch) | |
| tree | 9ed650b39b506419a9162e96c098b3998377eaff /include/linux | |
| parent | 955de2eab3fd89bc6d5735817710926ba5817450 (diff) | |
mfd: ab8500-sysctrl: Always enable pm_power_off handler
AB8500 sysctrl driver implements a pm_power_off handler, but that is
currently not registered until a specific platform data field is
enabled.
This patch drops the platform data field and always registers
ab8500_power_off if no other pm_power_off handler was defined before,
and also introduces the necessary cleanup code in the driver's remove
function.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/abx500/ab8500.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h index fb1bf7d6a410..0390d5943ed6 100644 --- a/include/linux/mfd/abx500/ab8500.h +++ b/include/linux/mfd/abx500/ab8500.h | |||
| @@ -373,13 +373,11 @@ struct ab8500_sysctrl_platform_data; | |||
| 373 | /** | 373 | /** |
| 374 | * struct ab8500_platform_data - AB8500 platform data | 374 | * struct ab8500_platform_data - AB8500 platform data |
| 375 | * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used | 375 | * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used |
| 376 | * @pm_power_off: Should machine pm power off hook be registered or not | ||
| 377 | * @init: board-specific initialization after detection of ab8500 | 376 | * @init: board-specific initialization after detection of ab8500 |
| 378 | * @regulator: machine-specific constraints for regulators | 377 | * @regulator: machine-specific constraints for regulators |
| 379 | */ | 378 | */ |
| 380 | struct ab8500_platform_data { | 379 | struct ab8500_platform_data { |
| 381 | int irq_base; | 380 | int irq_base; |
| 382 | bool pm_power_off; | ||
| 383 | void (*init) (struct ab8500 *); | 381 | void (*init) (struct ab8500 *); |
| 384 | struct ab8500_regulator_platform_data *regulator; | 382 | struct ab8500_regulator_platform_data *regulator; |
| 385 | struct abx500_gpio_platform_data *gpio; | 383 | struct abx500_gpio_platform_data *gpio; |
