diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-27 11:35:42 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:52:00 +0200 |
commit | 8c0cb2a51c75e78fd30168f1b400e228a069ec3a (patch) | |
tree | 1eb0e708ce9c5077525607e04a8ac2f9c68ee6ff /arch | |
parent | 5665b8cd84ed906996a51c858e7c71773de23c4e (diff) |
power: u5500: Fix and activate Battery Management for U5500
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 3 | ||||
-rw-r--r-- | arch/arm/mach-ux500/board-u5500-bm.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 011d6309665..864e3bb5a07 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -152,6 +152,9 @@ CONFIG_GPIO_TC3589X=y CONFIG_AB8500_GPIO=y CONFIG_POWER_SUPPLY=y CONFIG_AB8500_BM=y +CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y +CONFIG_AB5500_BM=y +CONFIG_AB5500_BATTERY_THERM_ON_BATCTRL=y CONFIG_SENSORS_AB8500=y CONFIG_SENSORS_DB8500=y CONFIG_SENSORS_LSM303DLH=y diff --git a/arch/arm/mach-ux500/board-u5500-bm.c b/arch/arm/mach-ux500/board-u5500-bm.c index 2616d7fa517..7cfc6386b35 100644 --- a/arch/arm/mach-ux500/board-u5500-bm.c +++ b/arch/arm/mach-ux500/board-u5500-bm.c @@ -13,7 +13,6 @@ #include <linux/power_supply.h> #include <linux/mfd/abx500.h> -#include <linux/mfd/abx500/ab5500.h> #include <linux/mfd/abx500/ab5500-bm.h> #include "board-u5500-bm.h" |