diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-27 11:35:42 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:53 +0200 |
| commit | 02f4452494af00b4c9941cb056b19213486bcf69 (patch) | |
| tree | ba1b08cd8d4d505cf31f42709b3b6a0eec80c1fa | |
| parent | 2eb0d026857b7d25df11be5bbf764ffa5f195d53 (diff) | |
power: u5500: Fix and activate Battery Management for U5500
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-bm.c | 1 | ||||
| -rw-r--r-- | drivers/power/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/power/ab5500_btemp.c | 1 | ||||
| -rw-r--r-- | drivers/power/ab5500_charger.c | 1 | ||||
| -rw-r--r-- | drivers/power/ab5500_fg.c | 1 |
5 files changed, 1 insertions, 5 deletions
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 c46388840a3..f3d5a7a95c3 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -310,7 +310,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); |