From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [Resending - PATCH 1/3] Triton BCI driver board/device setup for OMAP3430 Date: Tue, 5 Aug 2008 17:08:51 +0300 Message-ID: <20080805140850.GP7193@atomide.com> References: <38309.192.168.10.89.1216727733.squirrel@dbdmail.itg.ti.com> <1473aac0380c8c62329714e83f6ca795@felipebalbi.com> <002301c8ec7f$1405df30$37f6180a@ent.ti.com> <3db54da6fc6e74db523cc8e6bd2cf69d@felipebalbi.com> <20080805133550.GJ7193@atomide.com> <20080805140551.GC30539@gandalf.research.nokia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-bos.mailhop.org ([63.208.196.178]:63059 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752901AbYHEOJB (ORCPT ); Tue, 5 Aug 2008 10:09:01 -0400 Content-Disposition: inline In-Reply-To: <20080805140551.GC30539@gandalf.research.nokia.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Felipe Balbi Cc: Felipe Balbi , Madhusudhan Chikkature , linux-omap@vger.kernel.org, Mikko.K.Ylinen@nokia.com * Felipe Balbi [080805 17:06]: > On Tue, Aug 05, 2008 at 04:35:51PM +0300, Tony Lindgren wrote: > > * Felipe Balbi [080723 10:32]: > > > > > > > > > On Wed, 23 Jul 2008 10:16:27 +0530, "Madhusudhan Chikkature" > > > 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 > > 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 > --- > > 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 0x08000000 /* debug board */ > > -- > balbi