* [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled
@ 2010-03-19 10:46 Ranjith Lohithakshan
2010-04-28 21:30 ` Kevin Hilman
0 siblings, 1 reply; 4+ messages in thread
From: Ranjith Lohithakshan @ 2010-03-19 10:46 UTC (permalink / raw)
To: linux-omap; +Cc: khilman, ranjithl
Currently on PM branch, compilation fails when cpufreq is disabled
arch/arm/mach-omap2/clock3xxx_data.c: In function 'omap3xxx_clk_init':
arch/arm/mach-omap2/clock3xxx_data.c:3563: error: 'struct clk_functions'
has no member named 'clk_init_cpufreq_table'
arch/arm/mach-omap2/clock3xxx_data.c:3564: error:
'omap3_clk_init_cpufreq_table' undeclared (first use
in this function)
arch/arm/mach-omap2/clock3xxx_data.c:3564: error: (Each undeclared
identifier is reported only once
arch/arm/mach-omap2/clock3xxx_data.c:3564: error: for each function it
appears in.)
make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
This patch fixes the issue by avoiding runtime init of
clk_init_cpufreq_table in omap3xxx_clk_init and instead doing it when
omap2_clk_functions are defined.
Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
---
arch/arm/mach-omap2/clock.c | 4 ++++
arch/arm/mach-omap2/clock3xxx_data.c | 2 --
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index a6d0b34..498cb5b 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -492,7 +492,11 @@ struct clk_functions omap2_clk_functions = {
.clk_disable_unused = omap2_clk_disable_unused,
#ifdef CONFIG_CPU_FREQ
/* These will be removed when the OPP code is integrated */
+#ifdef CONFIG_ARCH_OMAP3
+ .clk_init_cpufreq_table = omap3_clk_init_cpufreq_table,
+#else
.clk_init_cpufreq_table = omap2_clk_init_cpufreq_table,
+#endif
.clk_exit_cpufreq_table = omap2_clk_exit_cpufreq_table,
#endif
};
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 57522de..d5153b6 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3560,8 +3560,6 @@ int __init omap3xxx_clk_init(void)
else
dpll4_dd = dpll4_dd_34xx;
- omap2_clk_functions.clk_init_cpufreq_table =
- omap3_clk_init_cpufreq_table;
clk_init(&omap2_clk_functions);
for (c = omap3xxx_clks; c < omap3xxx_clks + ARRAY_SIZE(omap3xxx_clks);
--
1.6.2.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled
2010-03-19 10:46 [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled Ranjith Lohithakshan
@ 2010-04-28 21:30 ` Kevin Hilman
2010-04-29 4:21 ` Ranjith Lohithakshan
0 siblings, 1 reply; 4+ messages in thread
From: Kevin Hilman @ 2010-04-28 21:30 UTC (permalink / raw)
To: Ranjith Lohithakshan; +Cc: linux-omap
Ranjith Lohithakshan <ranjithl@ti.com> writes:
> Currently on PM branch, compilation fails when cpufreq is disabled
>
> arch/arm/mach-omap2/clock3xxx_data.c: In function 'omap3xxx_clk_init':
> arch/arm/mach-omap2/clock3xxx_data.c:3563: error: 'struct clk_functions'
> has no member named 'clk_init_cpufreq_table'
> arch/arm/mach-omap2/clock3xxx_data.c:3564: error:
> 'omap3_clk_init_cpufreq_table' undeclared (first use
> in this function)
> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: (Each undeclared
> identifier is reported only once
> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: for each function it
> appears in.)
> make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
>
> This patch fixes the issue by avoiding runtime init of
> clk_init_cpufreq_table in omap3xxx_clk_init and instead doing it when
> omap2_clk_functions are defined.
>
> Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
Do you still have this problem? I'm unable to reproduce on current PM branch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled
2010-04-28 21:30 ` Kevin Hilman
@ 2010-04-29 4:21 ` Ranjith Lohithakshan
2010-04-29 14:02 ` Kevin Hilman
0 siblings, 1 reply; 4+ messages in thread
From: Ranjith Lohithakshan @ 2010-04-29 4:21 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-omap@vger.kernel.org
On Thu, 29-Apr-10 3:00 AM +0530, Kevin Hilman wrote:
> Ranjith Lohithakshan <ranjithl@ti.com> writes:
>
>> Currently on PM branch, compilation fails when cpufreq is disabled
>>
>> arch/arm/mach-omap2/clock3xxx_data.c: In function 'omap3xxx_clk_init':
>> arch/arm/mach-omap2/clock3xxx_data.c:3563: error: 'struct clk_functions'
>> has no member named 'clk_init_cpufreq_table'
>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error:
>> 'omap3_clk_init_cpufreq_table' undeclared (first use
>> in this function)
>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: (Each undeclared
>> identifier is reported only once
>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: for each function it
>> appears in.)
>> make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1
>> make: *** [arch/arm/mach-omap2] Error 2
>>
>> This patch fixes the issue by avoiding runtime init of
>> clk_init_cpufreq_table in omap3xxx_clk_init and instead doing it when
>> omap2_clk_functions are defined.
>>
>> Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
>
> Do you still have this problem? I'm unable to reproduce on current PM branch.
No, I don't see this now. Might have got fixed in some of the recent
changes.
Just FYI, I now see a linkage error with omap3_evm_defconfig
arch/arm/mach-omap2/built-in.o: In function `sr_configure_vp':
/tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:315: undefined
reference to `omap_twl_uv_to_vsel'
/tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:364: undefined
reference to `omap_twl_uv_to_vsel'
arch/arm/mach-omap2/built-in.o: In function `sr_enable':
/tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:609: undefined
reference to `omap_twl_uv_to_vsel'
arch/arm/mach-omap2/built-in.o: In function `sr_reset_voltage':
/tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:478: undefined
reference to `omap_twl_uv_to_vsel'
/tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:496: undefined
reference to `omap_twl_uv_to_vsel'
make: *** [.tmp_vmlinux1] Error 1
- Ranjith
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled
2010-04-29 4:21 ` Ranjith Lohithakshan
@ 2010-04-29 14:02 ` Kevin Hilman
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Hilman @ 2010-04-29 14:02 UTC (permalink / raw)
To: Ranjith Lohithakshan; +Cc: linux-omap@vger.kernel.org
Ranjith Lohithakshan <ranjithl@ti.com> writes:
> On Thu, 29-Apr-10 3:00 AM +0530, Kevin Hilman wrote:
>> Ranjith Lohithakshan <ranjithl@ti.com> writes:
>>
>>> Currently on PM branch, compilation fails when cpufreq is disabled
>>>
>>> arch/arm/mach-omap2/clock3xxx_data.c: In function 'omap3xxx_clk_init':
>>> arch/arm/mach-omap2/clock3xxx_data.c:3563: error: 'struct clk_functions'
>>> has no member named 'clk_init_cpufreq_table'
>>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error:
>>> 'omap3_clk_init_cpufreq_table' undeclared (first use
>>> in this function)
>>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: (Each undeclared
>>> identifier is reported only once
>>> arch/arm/mach-omap2/clock3xxx_data.c:3564: error: for each function it
>>> appears in.)
>>> make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1
>>> make: *** [arch/arm/mach-omap2] Error 2
>>>
>>> This patch fixes the issue by avoiding runtime init of
>>> clk_init_cpufreq_table in omap3xxx_clk_init and instead doing it when
>>> omap2_clk_functions are defined.
>>>
>>> Signed-off-by: Ranjith Lohithakshan <ranjithl@ti.com>
>>
>> Do you still have this problem? I'm unable to reproduce on current PM branch.
>
> No, I don't see this now. Might have got fixed in some of the recent
> changes.
>
> Just FYI, I now see a linkage error with omap3_evm_defconfig
>
> arch/arm/mach-omap2/built-in.o: In function `sr_configure_vp':
> /tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:315: undefined
> reference to `omap_twl_uv_to_vsel'
> /tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:364: undefined
> reference to `omap_twl_uv_to_vsel'
> arch/arm/mach-omap2/built-in.o: In function `sr_enable':
> /tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:609: undefined
> reference to `omap_twl_uv_to_vsel'
> arch/arm/mach-omap2/built-in.o: In function `sr_reset_voltage':
> /tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:478: undefined
> reference to `omap_twl_uv_to_vsel'
> /tmp/ranjith/l-o-new/arch/arm/mach-omap2/smartreflex.c:496: undefined
> reference to `omap_twl_uv_to_vsel'
> make: *** [.tmp_vmlinux1] Error 1
>
Yes, I saw that too when trying to reproduce your problem.
SmartReflex currently has a dependency on SRF where these OPP functions
are defined, and this needs to be fixed.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-04-30 22:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 10:46 [PATCH] OMAP3: PM: Fix compilation error observed when cpufreq is disabled Ranjith Lohithakshan
2010-04-28 21:30 ` Kevin Hilman
2010-04-29 4:21 ` Ranjith Lohithakshan
2010-04-29 14:02 ` Kevin Hilman
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).