* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
@ 2011-01-09 22:16 Santosh Shilimkar
2011-01-10 13:37 ` Anand Gadiyar
0 siblings, 1 reply; 7+ messages in thread
From: Santosh Shilimkar @ 2011-01-09 22:16 UTC (permalink / raw)
To: linux-arm-kernel
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@ti.com>
Cc: Paul Walmsley <paul@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),
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),
--
1.6.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-09 22:16 [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here Santosh Shilimkar
@ 2011-01-10 13:37 ` Anand Gadiyar
2011-01-10 13:40 ` Santosh Shilimkar
0 siblings, 1 reply; 7+ messages in thread
From: Anand Gadiyar @ 2011-01-10 13:37 UTC (permalink / raw)
To: linux-arm-kernel
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@ti.com>
> Cc: Paul Walmsley <paul@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@ti.com>
- Anand
> 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),
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-10 13:37 ` Anand Gadiyar
@ 2011-01-10 13:40 ` Santosh Shilimkar
2011-01-10 18:58 ` Paul Walmsley
0 siblings, 1 reply; 7+ messages in thread
From: Santosh Shilimkar @ 2011-01-10 13:40 UTC (permalink / raw)
To: linux-arm-kernel
> -----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@ti.com>
> > Cc: Paul Walmsley <paul@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@ti.com>
>
ok. I can add CK_36XX and repost it with your ack
> - Anand
>
> > 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-
> omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-10 13:40 ` Santosh Shilimkar
@ 2011-01-10 18:58 ` Paul Walmsley
2011-01-10 18:58 ` Paul Walmsley
0 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2011-01-10 18:58 UTC (permalink / raw)
To: linux-arm-kernel
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@ti.com>
> > > Cc: Paul Walmsley <paul@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@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@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-10 18:58 ` Paul Walmsley
@ 2011-01-10 18:58 ` Paul Walmsley
2011-01-10 19:07 ` Tony Lindgren
0 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2011-01-10 18:58 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 10 Jan 2011, Paul Walmsley wrote:
> 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@pwsan.com>
(once Santosh reposts the updated fix, that is)
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-10 18:58 ` Paul Walmsley
@ 2011-01-10 19:07 ` Tony Lindgren
2011-01-10 22:30 ` Tony Lindgren
0 siblings, 1 reply; 7+ messages in thread
From: Tony Lindgren @ 2011-01-10 19:07 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [110110 10:58]:
> On Mon, 10 Jan 2011, Paul Walmsley wrote:
>
> > 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@pwsan.com>
>
> (once Santosh reposts the updated fix, that is)
OK thanks will queue.
Tony
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here
2011-01-10 19:07 ` Tony Lindgren
@ 2011-01-10 22:30 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2011-01-10 22:30 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [110110 11:06]:
> * Paul Walmsley <paul@pwsan.com> [110110 10:58]:
> > On Mon, 10 Jan 2011, Paul Walmsley wrote:
> >
> > > 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@pwsan.com>
> >
> > (once Santosh reposts the updated fix, that is)
>
> OK thanks will queue.
I've queued the following updated version.
Regards,
Tony
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
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@ti.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
[tony at atomide.com: updated mask to include CK_36XX]
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- 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),
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-01-10 22:30 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-09 22:16 [PATCH] omap3: clocks: Fix build error 'CK_3430ES2' undeclared here Santosh Shilimkar
2011-01-10 13:37 ` Anand Gadiyar
2011-01-10 13:40 ` Santosh Shilimkar
2011-01-10 18:58 ` Paul Walmsley
2011-01-10 18:58 ` Paul Walmsley
2011-01-10 19:07 ` Tony Lindgren
2011-01-10 22:30 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).