omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

PATCH New Santosh Shilimkar 4 participants 7 messages Jan 9, 2011 – Jan 10, 2011

Subsystems (4)

Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support

lore

Share & tools

lore

Santosh Shilimkar

author

2011-01-09 22:16 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

Cc Paul Walmsley <[email protected]>

---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-omap2/clock3xxx_data.c +1 -1

index d3ab1c9..c54cc33 100644
@@ -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),

Signature · 1 line

1.6.0.4

Anand Gadiyar

2011-01-10 13:37 UTC #1 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Quoted 22 lines · Santosh Shilimkar

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 <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
index d3ab1c9..c54cc33 100644

arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3289

Quoted 5 lines

arch/arm/mach-omap2/clock3xxx_data.c +1 -1

@@ -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 <[email protected]>

- Anand

Quoted 3 lines

arch/arm/mach-omap2/clock3xxx_data.c +0 -0

 	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),

Santosh Shilimkar

author

2011-01-10 13:40 UTC #2 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Quoted 33 lines

-----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
Quoted 1 line · Santosh Shilimkar
At latest mainline commit 0c21e3aaf6a, omap2plus build is broken.
This
Quoted 1 line
patch is trivial fix for the missed usb clock node for
CK_3430ES2PLUS
Quoted 5 lines
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
arch/arm/mach-
Quoted 11 lines
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 <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-omap2/clock3xxx_data.c +0 -0
omap2/clock3xxx_data.c

Quoted 7 lines

arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3286
Quoted 5 lines
index d3ab1c9..c54cc33 100644
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
@@ -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

Quoted 8 lines

| CK_36XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3287
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
 	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS
| CK_AM35XX | CK_36XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3288
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -1
-	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
	CK_3430ES2 | CK_AM35XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3288
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +1 -0
+	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
	CK_3430ES2PLUS | CK_AM35XX),

Quoted 9 lines

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 <[email protected]>

ok. I can add CK_36XX and repost it with your ack

Quoted 13 lines

- Anand
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3289
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
 	CLK("omap-mcbsp.1",	"prcm_fck",	&core_96m_fck,
	CK_3XXX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3290
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
 	CLK("omap-mcbsp.5",	"prcm_fck",	&core_96m_fck,
	CK_3XXX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3292
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
 	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

Paul Walmsley

maintainer

2011-01-10 18:58 UTC #3 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Hello Santosh, Tony,

Quoted 51 lines · Santosh Shilimkar

Quoted 33 lines
-----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
Quoted 1 line · Santosh Shilimkar
At latest mainline commit 0c21e3aaf6a, omap2plus build is broken.
This
Quoted 1 line
patch is trivial fix for the missed usb clock node for
CK_3430ES2PLUS
Quoted 5 lines
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
arch/arm/mach-
Quoted 11 lines
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 <[email protected]>
Cc Paul Walmsley <[email protected]>
---
 arch/arm/mach-omap2/clock3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach- renamed from arch/arm/mach-omap2/clock3xxx_data.c +0 -0
omap2/clock3xxx_data.c
Quoted 7 lines
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3286
Quoted 5 lines
index d3ab1c9..c54cc33 100644
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
@@ -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
Quoted 10 lines
| CK_36XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3287
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -0
 	CLK(NULL,	"usbtll_fck",	&usbtll_fck,	CK_3430ES2PLUS
| CK_AM35XX | CK_36XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3288
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +0 -1
-	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
	CK_3430ES2 | CK_AM35XX),
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3288
Quoted 1 line
arch/arm/mach-omap2/clock3xxx_data.c +1 -0
+	CLK("ehci-omap.0",	"usbtll_fck",	&usbtll_fck,
	CK_3430ES2PLUS | CK_AM35XX),
Was about to post something similar.

Quoted 8 lines

Quoted 7 lines
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 <[email protected]>
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 <[email protected]>

- Paul

Paul Walmsley

maintainer

2011-01-10 18:58 UTC #4 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Quoted 4 lines · Paul Walmsley

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 <[email protected]>

(once Santosh reposts the updated fix, that is)

- Paul

Tony Lindgren

maintainer

2011-01-10 19:07 UTC #5 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Quoted 8 lines · Paul Walmsley

Quoted 4 lines · Paul Walmsley
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 <[email protected]>
(once Santosh reposts the updated fix, that is)

OK thanks will queue.

Tony

Tony Lindgren

maintainer

2011-01-10 22:30 UTC #6 lore raw

PATCH 1/1 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here

Quoted 11 lines · Tony Lindgren

Quoted 8 lines · Paul Walmsley
Quoted 4 lines · Paul Walmsley
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 <[email protected]>
(once Santosh reposts the updated fix, that is)
OK thanks will queue.

I've queued the following updated version.

Regards,

Tony

From: Santosh Shilimkar <[email protected]>
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.

Signed-off-by Santosh Shilimkar <[email protected]>

Acked-by Anand Gadiyar <[email protected]>

Acked-by Paul Walmsley <[email protected]>

[tony at atomide.com: updated mask to include CK_36XX]

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/mach-omap2/clock3xxx_data.c +1 -1

@@ -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),