* [PATCH] Fix TWL4030 BCI compilation break
@ 2008-08-21 15:49 Pandita, Vikram
2008-08-21 16:15 ` [PATCH] Enable TWL4030 BCI for LDP platform Pandita, Vikram
2008-09-05 18:21 ` [PATCH] Fix TWL4030 BCI compilation break Tony Lindgren
0 siblings, 2 replies; 4+ messages in thread
From: Pandita, Vikram @ 2008-08-21 15:49 UTC (permalink / raw)
To: linux-omap@vger.kernel.org; +Cc: Chikkature Rajashekar, Madhusudhan
From: Vikram Pandita <vikram.pandita@ti.com>
Fix following compilation error when enabling CONFIG_TWL4030_BCI_BATTERY
drivers/power/twl4030_bci_battery.c: In function 'twl4030_bci_battery_probe':
drivers/power/twl4030_bci_battery.c:911: error: dereferencing pointer to incomplete type
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
---
drivers/power/twl4030_bci_battery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: base-tony/drivers/power/twl4030_bci_battery.c
===================================================================
--- base-tony.orig/drivers/power/twl4030_bci_battery.c 2008-08-21 15:06:47.000000000 +0530
+++ base-tony/drivers/power/twl4030_bci_battery.c 2008-08-21 20:37:18.000000000 +0530
@@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c/twl4030.h>
#include <linux/power_supply.h>
-#include <asm/arch/bci.h>
+#include <mach/bci.h>
#include <linux/i2c/twl4030-madc.h>
#define T2_BATTERY_VOLT 0x04
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Enable TWL4030 BCI for LDP platform
2008-08-21 15:49 [PATCH] Fix TWL4030 BCI compilation break Pandita, Vikram
@ 2008-08-21 16:15 ` Pandita, Vikram
2008-09-05 18:22 ` Tony Lindgren
2008-09-05 18:21 ` [PATCH] Fix TWL4030 BCI compilation break Tony Lindgren
1 sibling, 1 reply; 4+ messages in thread
From: Pandita, Vikram @ 2008-08-21 16:15 UTC (permalink / raw)
To: linux-omap@vger.kernel.org; +Cc: Chikkature Rajashekar, Madhusudhan
From: Vikram Pandita <vikram.pandita@ti.com>
Add TWL4030 BCI Battery for 3430 LDP platform
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
---
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/board-ldp.c | 2 ++
arch/arm/plat-omap/include/mach/board-ldp.h | 2 ++
drivers/power/Kconfig | 2 +-
4 files changed, 6 insertions(+), 1 deletion(-)
Index: base-tony/arch/arm/mach-omap2/Makefile
===================================================================
--- base-tony.orig/arch/arm/mach-omap2/Makefile 2008-08-21 15:06:23.000000000 +0530
+++ base-tony/arch/arm/mach-omap2/Makefile 2008-08-21 21:22:15.000000000 +0530
@@ -66,6 +66,7 @@ obj-$(CONFIG_MACH_OMAP3_BEAGLE) += boar
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 \
Index: base-tony/arch/arm/mach-omap2/board-ldp.c
===================================================================
--- base-tony.orig/arch/arm/mach-omap2/board-ldp.c 2008-08-21 21:08:31.000000000 +0530
+++ base-tony/arch/arm/mach-omap2/board-ldp.c 2008-08-21 21:20:37.000000000 +0530
@@ -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();
Index: base-tony/arch/arm/plat-omap/include/mach/board-ldp.h
===================================================================
--- base-tony.orig/arch/arm/plat-omap/include/mach/board-ldp.h 2008-08-21 15:06:24.000000000 +0530
+++ base-tony/arch/arm/plat-omap/include/mach/board-ldp.h 2008-08-21 21:12:52.000000000 +0530
@@ -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 */
Index: base-tony/drivers/power/Kconfig
===================================================================
--- base-tony.orig/drivers/power/Kconfig 2008-08-21 21:08:31.000000000 +0530
+++ base-tony/drivers/power/Kconfig 2008-08-21 21:09:17.000000000 +0530
@@ -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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix TWL4030 BCI compilation break
2008-08-21 15:49 [PATCH] Fix TWL4030 BCI compilation break Pandita, Vikram
2008-08-21 16:15 ` [PATCH] Enable TWL4030 BCI for LDP platform Pandita, Vikram
@ 2008-09-05 18:21 ` Tony Lindgren
1 sibling, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2008-09-05 18:21 UTC (permalink / raw)
To: Pandita, Vikram
Cc: linux-omap@vger.kernel.org, Chikkature Rajashekar, Madhusudhan
* Pandita, Vikram <vikram.pandita@ti.com> [080821 08:53]:
> From: Vikram Pandita <vikram.pandita@ti.com>
>
> Fix following compilation error when enabling CONFIG_TWL4030_BCI_BATTERY
>
> drivers/power/twl4030_bci_battery.c: In function 'twl4030_bci_battery_probe':
> drivers/power/twl4030_bci_battery.c:911: error: dereferencing pointer to incomplete type
Pushing today.
Tony
>
> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> ---
> drivers/power/twl4030_bci_battery.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: base-tony/drivers/power/twl4030_bci_battery.c
> ===================================================================
> --- base-tony.orig/drivers/power/twl4030_bci_battery.c 2008-08-21 15:06:47.000000000 +0530
> +++ base-tony/drivers/power/twl4030_bci_battery.c 2008-08-21 20:37:18.000000000 +0530
> @@ -23,7 +23,7 @@
> #include <linux/platform_device.h>
> #include <linux/i2c/twl4030.h>
> #include <linux/power_supply.h>
> -#include <asm/arch/bci.h>
> +#include <mach/bci.h>
> #include <linux/i2c/twl4030-madc.h>
>
> #define T2_BATTERY_VOLT 0x04
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Enable TWL4030 BCI for LDP platform
2008-08-21 16:15 ` [PATCH] Enable TWL4030 BCI for LDP platform Pandita, Vikram
@ 2008-09-05 18:22 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2008-09-05 18:22 UTC (permalink / raw)
To: Pandita, Vikram
Cc: linux-omap@vger.kernel.org, Chikkature Rajashekar, Madhusudhan
* Pandita, Vikram <vikram.pandita@ti.com> [080821 09:22]:
> From: Vikram Pandita <vikram.pandita@ti.com>
>
> Add TWL4030 BCI Battery for 3430 LDP platform
Pushing today.
Tony
>
> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
> ---
> arch/arm/mach-omap2/Makefile | 1 +
> arch/arm/mach-omap2/board-ldp.c | 2 ++
> arch/arm/plat-omap/include/mach/board-ldp.h | 2 ++
> drivers/power/Kconfig | 2 +-
> 4 files changed, 6 insertions(+), 1 deletion(-)
>
> Index: base-tony/arch/arm/mach-omap2/Makefile
> ===================================================================
> --- base-tony.orig/arch/arm/mach-omap2/Makefile 2008-08-21 15:06:23.000000000 +0530
> +++ base-tony/arch/arm/mach-omap2/Makefile 2008-08-21 21:22:15.000000000 +0530
> @@ -66,6 +66,7 @@ obj-$(CONFIG_MACH_OMAP3_BEAGLE) += boar
> 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 \
> Index: base-tony/arch/arm/mach-omap2/board-ldp.c
> ===================================================================
> --- base-tony.orig/arch/arm/mach-omap2/board-ldp.c 2008-08-21 21:08:31.000000000 +0530
> +++ base-tony/arch/arm/mach-omap2/board-ldp.c 2008-08-21 21:20:37.000000000 +0530
> @@ -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();
> Index: base-tony/arch/arm/plat-omap/include/mach/board-ldp.h
> ===================================================================
> --- base-tony.orig/arch/arm/plat-omap/include/mach/board-ldp.h 2008-08-21 15:06:24.000000000 +0530
> +++ base-tony/arch/arm/plat-omap/include/mach/board-ldp.h 2008-08-21 21:12:52.000000000 +0530
> @@ -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 */
> Index: base-tony/drivers/power/Kconfig
> ===================================================================
> --- base-tony.orig/drivers/power/Kconfig 2008-08-21 21:08:31.000000000 +0530
> +++ base-tony/drivers/power/Kconfig 2008-08-21 21:09:17.000000000 +0530
> @@ -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.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-09-05 18:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-21 15:49 [PATCH] Fix TWL4030 BCI compilation break Pandita, Vikram
2008-08-21 16:15 ` [PATCH] Enable TWL4030 BCI for LDP platform Pandita, Vikram
2008-09-05 18:22 ` Tony Lindgren
2008-09-05 18:21 ` [PATCH] Fix TWL4030 BCI compilation break Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox