Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
* Felipe Balbi [EMAIL PROTECTED] [080723 10:32]: On Wed, 23 Jul 2008 10:16:27 +0530, Madhusudhan Chikkature [EMAIL PROTECTED] wrote: Hi Felipe, Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Yes. I see that these prototypes are still present in the board3430 and board2430 header files in the omap tree. Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. You mean I should apply the attached patch you sent for local use, right? And I guess I dont need to resend this perticular BCI patch, am I correct? No :-) that was to Tony. Just replied to your mail so it's easy to see why we need that patch :-) Pushing these today. Do you have a patch for moving the extern prototypes into the twl header? Tony -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
On Tue, Aug 05, 2008 at 04:35:51PM +0300, Tony Lindgren wrote: * Felipe Balbi [EMAIL PROTECTED] [080723 10:32]: On Wed, 23 Jul 2008 10:16:27 +0530, Madhusudhan Chikkature [EMAIL PROTECTED] wrote: Hi Felipe, Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Yes. I see that these prototypes are still present in the board3430 and board2430 header files in the omap tree. Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. You mean I should apply the attached patch you sent for local use, right? And I guess I dont need to resend this perticular BCI patch, am I correct? No :-) that was to Tony. Just replied to your mail so it's easy to see why we need that patch :-) Pushing these today. Do you have a patch for moving the extern prototypes into the twl header? I was talking about these: From: Felipe Balbi [EMAIL PROTECTED] arch: omap: get rid of usb_init() protytpes we now use usb_musb_init() and usb_ehci_init() functions Signed-off-by: Felipe Balbi [EMAIL PROTECTED] --- diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/include/asm-arm/arch-omap/board-2430sdp.h index fde6915..83d0eec 100644 --- a/include/asm-arm/arch-omap/board-2430sdp.h +++ b/include/asm-arm/arch-omap/board-2430sdp.h @@ -36,6 +36,5 @@ /* Function prototypes */ extern void sdp2430_flash_init(void); -extern void sdp2430_usb_init(void); #endif /* __ASM_ARCH_OMAP_2430SDP_H */ diff --git a/include/asm-arm/arch-omap/board-3430sdp.h b/include/asm-arm/arch-omap/board-3430sdp.h index d583008..85f769e 100644 --- a/include/asm-arm/arch-omap/board-3430sdp.h +++ b/include/asm-arm/arch-omap/board-3430sdp.h @@ -29,7 +29,6 @@ #ifndef __ASM_ARCH_OMAP_3430SDP_H #define __ASM_ARCH_OMAP_3430SDP_H -extern void sdp3430_usb_init(void); extern void sdp3430_flash_init(void); #define DEBUG_BASE 0x0800 /* debug board */ -- balbi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
* Felipe Balbi [EMAIL PROTECTED] [080805 17:06]: On Tue, Aug 05, 2008 at 04:35:51PM +0300, Tony Lindgren wrote: * Felipe Balbi [EMAIL PROTECTED] [080723 10:32]: On Wed, 23 Jul 2008 10:16:27 +0530, Madhusudhan Chikkature [EMAIL PROTECTED] wrote: Hi Felipe, Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Yes. I see that these prototypes are still present in the board3430 and board2430 header files in the omap tree. Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. You mean I should apply the attached patch you sent for local use, right? And I guess I dont need to resend this perticular BCI patch, am I correct? No :-) that was to Tony. Just replied to your mail so it's easy to see why we need that patch :-) Pushing these today. Do you have a patch for moving the extern prototypes into the twl header? I was talking about these: From: Felipe Balbi [EMAIL PROTECTED] arch: omap: get rid of usb_init() protytpes we now use usb_musb_init() and usb_ehci_init() functions OK, thanks. Will push today. Tony Signed-off-by: Felipe Balbi [EMAIL PROTECTED] --- diff --git a/include/asm-arm/arch-omap/board-2430sdp.h b/include/asm-arm/arch-omap/board-2430sdp.h index fde6915..83d0eec 100644 --- a/include/asm-arm/arch-omap/board-2430sdp.h +++ b/include/asm-arm/arch-omap/board-2430sdp.h @@ -36,6 +36,5 @@ /* Function prototypes */ extern void sdp2430_flash_init(void); -extern void sdp2430_usb_init(void); #endif /* __ASM_ARCH_OMAP_2430SDP_H */ diff --git a/include/asm-arm/arch-omap/board-3430sdp.h b/include/asm-arm/arch-omap/board-3430sdp.h index d583008..85f769e 100644 --- a/include/asm-arm/arch-omap/board-3430sdp.h +++ b/include/asm-arm/arch-omap/board-3430sdp.h @@ -29,7 +29,6 @@ #ifndef __ASM_ARCH_OMAP_3430SDP_H #define __ASM_ARCH_OMAP_3430SDP_H -extern void sdp3430_usb_init(void); extern void sdp3430_flash_init(void); #define DEBUG_BASE 0x0800 /* debug board */ -- balbi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
On Wed, 23 Jul 2008 10:16:27 +0530, Madhusudhan Chikkature [EMAIL PROTECTED] wrote: Hi Felipe, Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Yes. I see that these prototypes are still present in the board3430 and board2430 header files in the omap tree. Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. You mean I should apply the attached patch you sent for local use, right? And I guess I dont need to resend this perticular BCI patch, am I correct? No :-) that was to Tony. Just replied to your mail so it's easy to see why we need that patch :-) -- Best Regards, Felipe Balbi http://blog.felipebalbi.com [EMAIL PROTECTED] -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
From: Madhusudhan Chikkature[EMAIL PROTECTED] Device setup/board level initialization for the Triton battery charger interface driver for the OMAP3430 SDP. Signed-off-by: Madhusudhan Chikkature[EMAIL PROTECTED] --- arch/arm/mach-omap2/Makefile |3 + arch/arm/mach-omap2/bci.c | 57 ++ arch/arm/mach-omap2/board-3430sdp.c |1 include/asm-arm/arch-omap/bci.h | 17 include/asm-arm/arch-omap/board-3430sdp.h |1 5 files changed, 78 insertions(+), 1 deletion(-) Index: linux-omap-2.6/arch/arm/mach-omap2/Makefile === --- linux-omap-2.6.orig/arch/arm/mach-omap2/Makefile2008-07-22 11:58:54.0 +0530 +++ linux-omap-2.6/arch/arm/mach-omap2/Makefile 2008-07-22 12:01:10.0 +0530 @@ -47,7 +47,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar hsmmc.o \ usb-musb.o \ usb-ehci.o \ - board-3430sdp-flash.o + board-3430sdp-flash.o \ + bci.o obj-$(CONFIG_MACH_OMAP3EVM)+= board-omap3evm.o \ hsmmc.o \ usb-musb.o usb-ehci.o \ Index: linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c === --- linux-omap-2.6.orig/arch/arm/mach-omap2/board-3430sdp.c 2008-07-22 11:58:54.0 +0530 +++ linux-omap-2.6/arch/arm/mach-omap2/board-3430sdp.c 2008-07-22 12:01:10.0 +0530 @@ -299,6 +299,7 @@ static void __init omap_3430sdp_init(voi ARRAY_SIZE(sdp3430_spi_board_info)); ads7846_dev_init(); sdp3430_flash_init(); + twl4030_bci_battery_init(); omap_serial_init(); usb_musb_init(); usb_ehci_init(); Index: linux-omap-2.6/include/asm-arm/arch-omap/board-3430sdp.h === --- linux-omap-2.6.orig/include/asm-arm/arch-omap/board-3430sdp.h 2008-07-22 11:58:54.0 +0530 +++ linux-omap-2.6/include/asm-arm/arch-omap/board-3430sdp.h2008-07-22 12:01:10.0 +0530 @@ -31,6 +31,7 @@ extern void sdp3430_usb_init(void); extern void sdp3430_flash_init(void); +extern void twl4030_bci_battery_init(void); #define DEBUG_BASE 0x0800 /* debug board */ Index: linux-omap-2.6/arch/arm/mach-omap2/bci.c === --- /dev/null 1970-01-01 00:00:00.0 + +++ linux-omap-2.6/arch/arm/mach-omap2/bci.c2008-07-22 12:02:39.0 +0530 @@ -0,0 +1,57 @@ +/* + * linux/arch/arm/mach-omap2/bci.c + * + * TWL4030 BCI platform device setup/initialization + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include linux/module.h +#include linux/kernel.h +#include linux/init.h +#include linux/platform_device.h +#include asm/arch/bci.h + +#if defined(CONFIG_TWL4030_BCI_BATTERY) || \ + defined(CONFIG_TWL4030_BCI_BATTERY_MODULE) +/* + * Thermistor Calibration for Current Source and MADC + * Tolerance (for THS05-3H103F) + */ +static int sdp3430_batt_table[] = { +/* 0 C*/ +30800, 29500, 28300, 27100, +26000, 24900, 23900, 22900, 22000, 21100, 20300, 19400, 18700, 17900, +17200, 16500, 15900, 15300, 14700, 14100, 13600, 13100, 12600, 12100, +11600, 11200, 10800, 10400, 1, 9630, 9280, 8950, 8620, 8310, +8020, 7730, 7460, 7200, 6950, 6710, 6470, 6250, 6040, 5830, +5640, 5450, 5260, 5090, 4920, 4760, 4600, 4450, 4310, 4170, +4040, 3910, 3790, 3670, 3550 +}; + +static struct twl4030_bci_platform_data sdp3430_bci_data = { + .battery_tmp_tbl = sdp3430_batt_table, + .tblsize = ARRAY_SIZE(sdp3430_batt_table), +}; + +static struct platform_device twl4030_bci_battery_device = { + .name = twl4030-bci-battery, + .id = -1, + .dev= { + .platform_data = sdp3430_bci_data, + }, + .num_resources = 0, +}; + +void __init twl4030_bci_battery_init(void) +{ + (void) platform_device_register(twl4030_bci_battery_device); +} +#else +void __init twl4030_bci_battery_init(void) +{ +} +#endif Index: linux-omap-2.6/include/asm-arm/arch-omap/bci.h === --- /dev/null 1970-01-01 00:00:00.0 + +++ linux-omap-2.6/include/asm-arm/arch-omap/bci.h 2008-07-22 12:01:10.0 +0530 @@ -0,0 +1,17 @@ +/* + *
Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430
Hi Felipe, Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Yes. I see that these prototypes are still present in the board3430 and board2430 header files in the omap tree. Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. You mean I should apply the attached patch you sent for local use, right? And I guess I dont need to resend this perticular BCI patch, am I correct? Regards, Madhu - Original Message - From: Felipe Balbi [EMAIL PROTECTED] To: Tony Lindgren [EMAIL PROTECTED] Cc: Madhusudhan Chikkature [EMAIL PROTECTED]; linux-omap@vger.kernel.org; [EMAIL PROTECTED] Sent: Tuesday, July 22, 2008 6:03 PM Subject: Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430 Hi, On Tue, 22 Jul 2008 17:25:33 +0530 (IST), Madhusudhan Chikkature [EMAIL PROTECTED] wrote: extern void sdp3430_usb_init(void); Tony, weird that we still have these prototypes in these headers. Could be some merging conflict ? Anyways, please apply the attached patch. We're using usb_musb_init() and usb_ehci_init() now. -- Best Regards, Felipe Balbi http://blog.felipebalbi.com [EMAIL PROTECTED] -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html