diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-05 14:58:21 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:00 +0200 |
| commit | 4068b26145ed0fdb1296ca2e77524a9ddd301871 (patch) | |
| tree | cda06600fe04e3596e5961f8a4f10edea1650fec | |
| parent | c1f2731a5b5e068dfc30218e8ef005f17b50ec41 (diff) | |
ux500: Fix CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL configuration
Remove the temporary AB8500_BATTERY_THERM_ON_BATCTRL flag and use
CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL instead
ST-Ericsson Linux next: -
ST-Ericsson Change-ID: ER330310
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Ib4328deaa4fafe887f9082fc8a1e8e0c618e0d61
Signed-off-by: Mikael HEDEN <mikael.xx.heden@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19014
Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com>
Reviewed-by: Johan GARDSMARK <johan.gardsmark@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Conflicts:
arch/arm/mach-ux500/Makefile
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-bm.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 706c99ac6de..2caed676923 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -2,10 +2,6 @@ # Makefile for the linux kernel, U8500 machine. # -ifeq ($(CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL), y) - CFLAGS_board-mop500-bm.o += -DAB8500_BATTERY_THERM_ON_BATCTRL -endif - obj-y := clock.o cpu.o devices.o dcache.o \ devices-common.o id.o pins.o \ timer.o timer-mtu.o usb.o diff --git a/arch/arm/mach-ux500/board-mop500-bm.c b/arch/arm/mach-ux500/board-mop500-bm.c index 031d8721f4a..945964f3300 100644 --- a/arch/arm/mach-ux500/board-mop500-bm.c +++ b/arch/arm/mach-ux500/board-mop500-bm.c @@ -14,7 +14,7 @@ #include <linux/mfd/ab8500/bm.h> #include "board-mop500-bm.h" -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL /* * These are the defined batteries that uses a NTC and ID resistor placed * inside of the battery pack. @@ -176,7 +176,7 @@ static const struct battery_type bat_type[] = { .v_to_cap_tbl = cap_tbl, }, -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL { .name = POWER_SUPPLY_TECHNOLOGY_LIPO, .resis_high = 53407, @@ -390,7 +390,7 @@ struct ab8500_bm_data ab8500_bm_data = { .usb_safety_tmr_h = 4, .bkup_bat_v = BUP_VCH_SEL_2P6V, .bkup_bat_i = BUP_ICH_SEL_150UA, -#ifdef AB8500_BATTERY_THERM_ON_BATCTRL +#ifdef CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL .adc_therm = ADC_THERM_BATCTRL, #else .adc_therm = ADC_THERM_BATTEMP, |