[PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

[Paul Walmsley]

Hello Santosh, Tony,

On Mon, 10 Jan 2011, Santosh Shilimkar wrote:

> > -----Original Message-----
> > From: linux-omap-owner at vger.kernel.org [mailto:linux-omap-
> > owner at vger.kernel.org] On Behalf Of Anand Gadiyar
> > Sent: Monday, January 10, 2011 7:07 PM
> > To: Santosh Shilimkar
> > Cc: linux-omap at vger.kernel.org; tony at atomide.com; linux-arm-
> > kernel at lists.infradead.org; Paul Walmsley
> > Subject: Re: [PATCH] omap3: clocks: Fix build error 'CK_3430ES2'
> > undeclared here
> >
> > On 1/10/2011 3:46 AM, Santosh Shilimkar wrote:
> > > At latest mainline commit 0c21e3aaf6a,  omap2plus build is broken.
> > This
> > > patch is trivial fix for the missed usb clock node for
> > CK_3430ES2PLUS
> > > flag update.
> > >
> > >  CHK     include/generated/compile.h
> > >   CC      arch/arm/mach-omap2/clock3xxx_data.o
> > > arch/arm/mach-omap2/clock3xxx_data.c:3289: error: 'CK_3430ES2'
> > undeclared
> > > here (not in a function)
> > > make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1
> > > make: *** [arch/arm/mach-omap2] Error 2
> > >
> > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
> > > Cc: Paul Walmsley <paul at pwsan.com>
> > > ---
> > >  arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-
> > omap2/clock3xxx_data.c
> > > index d3ab1c9..c54cc33 100644
> > > --- a/arch/arm/mach-omap2/clock3xxx_data.c
> > > +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> > > @@ -3286,7 +3286,7 @@ static struct omap_clk omap3xxx_clks[] = {
> > >  	CLK(NULL,	"cpefuse_fck",	&cpefuse_fck,	CK_3430ES2PLUS
> > | CK_AM35XX | CK_36XX),
> > >  	CLK(NULL,	"ts_fck",	&ts_fck,	CK_3430ES2PLUS |
> CK_AM35XX
> > | CK_36XX),
> > >  	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS
> > | CK_AM35XX | CK_36XX),
> > > -	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
> > 	CK_3430ES2 | CK_AM35XX),
> > > +	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
> > 	CK_3430ES2PLUS | CK_AM35XX),
> >
> > Was about to post something similar.
> >
> > Can you update this line to add CK_36XX as well. Without this, we
> > won't be able to use
> > the USBHOST on 36xx/37xx platforms.
> >
> > With this, feel free to add my
> > Acked-by: Anand Gadiyar <gadiyar at ti.com>
> >
> ok. I can add CK_36XX and repost it with your ack

Looks good to me.  Tony, do you want to merge this one as part of the -rc 
series?  If so then it is:

Acked-by: Paul Walmsley <paul at pwsan.com>


- Paul