* Greg KH <gregkh@xxxxxxx> [110107 14:05]:
> On Fri, Jan 07, 2011 at 01:22:40PM -0800, Linus Torvalds wrote:
> > On Thu, Jan 6, 2011 at 3:50 PM, Greg KH <gregkh@xxxxxxx> wrote:
> > >
> > > Nothing radical here at all, lots of musb changes, which touched a bunch
> > > of arch-specific code, and some new drivers, mostly gadget ones.
> >
> > There were also a number of conflicts with the ARM updates (omap clock
> > data in particular - added aliases, changed names, you name it).
> >
> > I spent some time trying to fix it up properly, and maybe I even
> > succeeded, but you guys should really look the result over.
>
> The drivers/usb/* changes look good to me. I know Tony was looking at
> the omap merge issues, and if there was one, I think he had the needed
> fixup.
>
> thanks for doing the merge.
The merge was good thanks. The clock changes in the omap tree caused
a minor issue, I have the following patch queued up to fix it. Will
post a pull request soonish along with few other patches.
Regards,
Tony
From: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date: Sun, 9 Jan 2011 22:16:13 +0000
Subject: [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
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@xxxxxx>
Acked-by: Anand Gadiyar <gadiyar@xxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
[tony@xxxxxxxxxxx: updated mask to include CK_36XX]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
--- 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 | CK_36XX),
CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
