summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-27 11:35:42 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:32 +0200
commita294673dd9094dcad8dcb4ef04099d5d671332ac (patch)
treeee64f58653cac4a65d20c5d1bc63a1ac28c274f1 /arch
parent17232b0d66b6cde397d6479025aa67e53f2ebd66 (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_defconfig3
-rw-r--r--arch/arm/mach-ux500/board-u5500-bm.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index e095688d4bf..07c8f198f79 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -157,6 +157,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"