Enable TWL4030 BCI for LDP platform

Add TWL4030 BCI Battery for 3430 LDP platform

Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index d89b7cbb097e1be7c32c83f50e439fea329cf37d..c667821b0738ae6800af4da22a09fdf470a1550a 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -65,6 +65,7 @@ obj-$(CONFIG_MACH_OMAP3_BEAGLE)               += board-omap3beagle.o \
                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_LDP)            += board-ldp.o \
                                           hsmmc.o \
+                                          bci.o \
                                           usb-musb.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)                += board-apollon.o \
                                           board-apollon-mmc.o  \

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 7f672c6b0b55e30b997598f904e30ab0cfb486b5..987f86039d61b9420d863f6b700bc7bd75c5170c 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -29,6 +29,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <mach/board-ldp.h>
 #include <mach/mcspi.h>
 #include <mach/gpio.h>
 #include <mach/board.h>
@@ -230,6 +231,7 @@ static void __init omap_ldp_init(void)
        spi_register_board_info(ldp_spi_board_info,
                                ARRAY_SIZE(ldp_spi_board_info));
        ads7846_dev_init();
+       twl4030_bci_battery_init();
        omap_serial_init();
        usb_musb_init();
        hsmmc_init();

diff --git a/arch/arm/plat-omap/include/mach/board-ldp.h b/arch/arm/plat-omap/include/mach/board-ldp.h
index 283fa01c9b246a78b10ffaef18b143f86be33e03..66e2746c04cac80a8637b3ce28e74c01782591cd 100644 (file)
--- a/arch/arm/plat-omap/include/mach/board-ldp.h
+++ b/arch/arm/plat-omap/include/mach/board-ldp.h
@@ -29,6 +29,8 @@
 #ifndef __ASM_ARCH_OMAP_LDP_H
 #define __ASM_ARCH_OMAP_LDP_H
 
+extern void twl4030_bci_battery_init(void);
+
 #define TWL4030_IRQNUM         INT_34XX_SYS_NIRQ
 
 #endif /* __ASM_ARCH_OMAP_LDP_H */

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 7bd8c2b415756424e74bf50faad18285a4afdcaf..c0a3036cfaaaef01c22ceb260d57b2c5631773bd 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -72,7 +72,7 @@ config BATTERY_BQ27200
 
 config TWL4030_BCI_BATTERY
        tristate "OMAP TWL4030 BCI Battery driver"
-       depends on (MACH_OMAP_2430SDP || MACH_OMAP_3430SDP) && TWL4030_MADC
+       depends on (MACH_OMAP_2430SDP || MACH_OMAP_3430SDP || MACH_OMAP_LDP) && TWL4030_MADC
        default y
        help
          Support for OMAP TWL4030 BCI Battery driver.