aboutsummaryrefslogtreecommitdiff
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
parent17232b0d66b6cde397d6479025aa67e53f2ebd66 (diff)
downloadlinux-2.6.38-lt-ux500-a294673dd9094dcad8dcb4ef04099d5d671332ac.tar.gz
power: u5500: Fix and activate Battery Management for U5500
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/configs/u8500_defconfig3
-rw-r--r--arch/arm/mach-ux500/board-u5500-bm.c1
-rw-r--r--drivers/power/Kconfig2
-rw-r--r--drivers/power/ab5500_btemp.c1
-rw-r--r--drivers/power/ab5500_charger.c1
-rw-r--r--drivers/power/ab5500_fg.c1
-rw-r--r--drivers/power/abx500_chargalg.c1
7 files changed, 4 insertions, 6 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"
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 5f503c12c2b..14882b5b12a 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -220,7 +220,7 @@ config AB8500_BATTERY_THERM_ON_BATCTRL
config AB5500_BM
bool "AB5500 Battery Management Driver"
- depends on AB5500_CORE && MACH_B5500
+ depends on AB5500_CORE && AB8500_GPADC && ARCH_U8500
help
Say Y to include support for AB5500 battery management.
diff --git a/drivers/power/ab5500_btemp.c b/drivers/power/ab5500_btemp.c
index 57241c96f60..8b6ff82a86b 100644
--- a/drivers/power/ab5500_btemp.c
+++ b/drivers/power/ab5500_btemp.c
@@ -20,7 +20,6 @@
#include <linux/completion.h>
#include <linux/workqueue.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/mfd/abx500/ab5500-bm.h>
#include <linux/mfd/abx500/ab5500-gpadc.h>
diff --git a/drivers/power/ab5500_charger.c b/drivers/power/ab5500_charger.c
index 1b6bfa21d00..2fd7888ad9d 100644
--- a/drivers/power/ab5500_charger.c
+++ b/drivers/power/ab5500_charger.c
@@ -23,7 +23,6 @@
#include <linux/workqueue.h>
#include <linux/kobject.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/mfd/abx500/ab5500-bm.h>
#include <linux/mfd/abx500/ab5500-gpadc.h>
#include <linux/mfd/abx500/ux500_chargalg.h>
diff --git a/drivers/power/ab5500_fg.c b/drivers/power/ab5500_fg.c
index 1c866e8fec5..919af5faadf 100644
--- a/drivers/power/ab5500_fg.c
+++ b/drivers/power/ab5500_fg.c
@@ -25,7 +25,6 @@
#include <linux/delay.h>
#include <linux/mfd/abx500/ab5500-gpadc.h>
#include <linux/mfd/abx500/ab5500-bm.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/mfd/abx500.h>
static LIST_HEAD(ab5500_fg_list);
diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index c85e284e04a..bb0fa42b109 100644
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -21,7 +21,6 @@
#include <linux/workqueue.h>
#include <linux/kobject.h>
#include <linux/mfd/abx500.h>
-#include <linux/mfd/abx500/ab5500.h>
#include <linux/mfd/abx500/ux500_chargalg.h>
#include <linux/mfd/abx500/ab5500-bm.h>