* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
@ 2012-04-05 21:20 Kevin Hilman
2012-04-05 21:33 ` Paul Walmsley
0 siblings, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2012-04-05 21:20 UTC (permalink / raw)
To: linux-arm-kernel
For OMAP4 only builds, the omap2_prm_* functions have dummy wrappers
to detect incorrect usage. However, several unrelated omap3 PRM
functions have made it inside the #else clause of the #ifdef wrapping
the omap2_prm stubs, causing them to disappear on OMAP4-only builds.
This was unnoticed until the IO chain support was added and introduced
a new function in this section which is referenced by omap_hwmod.c:
/work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c: In function '_reconfigure_io_chain':
/work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c:1665:3: error: implicit declaration of function 'omap3xxx_prm_reconfigure_io_chain' [-Werror=implicit-fungiction-declaration]
Fix by using the #ifdef to only wrap the omap2_prm functions that
need stubs on OMAP4-only builds.
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
Paul, this patch applies on top your io_chain_devel_3.5 branch.
arch/arm/mach-omap2/prm2xxx_3xxx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index 1ba3d65..a8c946f 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -303,6 +303,8 @@ extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);
extern int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);
extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift);
+#endif /* CONFIG_ARCH_OMAP4 */
+
/* OMAP3-specific VP functions */
u32 omap3_prm_vp_check_txdone(u8 vp_id);
void omap3_prm_vp_clear_txdone(u8 vp_id);
@@ -323,8 +325,6 @@ extern void omap3xxx_prm_ocp_barrier(void);
extern void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask);
extern void omap3xxx_prm_restore_irqen(u32 *saved_mask);
-#endif /* CONFIG_ARCH_OMAP4 */
-
#endif
/*
--
1.7.9.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
2012-04-05 21:20 [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build Kevin Hilman
@ 2012-04-05 21:33 ` Paul Walmsley
2012-04-05 22:53 ` Tony Lindgren
2012-04-06 0:07 ` Kevin Hilman
0 siblings, 2 replies; 6+ messages in thread
From: Paul Walmsley @ 2012-04-05 21:33 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 5 Apr 2012, Kevin Hilman wrote:
> For OMAP4 only builds, the omap2_prm_* functions have dummy wrappers
> to detect incorrect usage. However, several unrelated omap3 PRM
> functions have made it inside the #else clause of the #ifdef wrapping
> the omap2_prm stubs, causing them to disappear on OMAP4-only builds.
>
> This was unnoticed until the IO chain support was added and introduced
> a new function in this section which is referenced by omap_hwmod.c:
>
> /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c: In function '_reconfigure_io_chain':
> /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c:1665:3: error: implicit declaration of function 'omap3xxx_prm_reconfigure_io_chain' [-Werror=implicit-fungiction-declaration]
>
> Fix by using the #ifdef to only wrap the omap2_prm functions that
> need stubs on OMAP4-only builds.
>
> Cc: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> Paul, this patch applies on top your io_chain_devel_3.5 branch.
Thanks, Tony reported this too. Any objections to me rolling this into
the offending patch?
>
- Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
2012-04-05 21:33 ` Paul Walmsley
@ 2012-04-05 22:53 ` Tony Lindgren
2012-04-05 23:37 ` Paul Walmsley
2012-04-06 0:07 ` Kevin Hilman
1 sibling, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2012-04-05 22:53 UTC (permalink / raw)
To: linux-arm-kernel
* Paul Walmsley <paul@pwsan.com> [120405 14:36]:
> On Thu, 5 Apr 2012, Kevin Hilman wrote:
>
> > For OMAP4 only builds, the omap2_prm_* functions have dummy wrappers
> > to detect incorrect usage. However, several unrelated omap3 PRM
> > functions have made it inside the #else clause of the #ifdef wrapping
> > the omap2_prm stubs, causing them to disappear on OMAP4-only builds.
> >
> > This was unnoticed until the IO chain support was added and introduced
> > a new function in this section which is referenced by omap_hwmod.c:
> >
> > /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c: In function '_reconfigure_io_chain':
> > /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c:1665:3: error: implicit declaration of function 'omap3xxx_prm_reconfigure_io_chain' [-Werror=implicit-fungiction-declaration]
> >
> > Fix by using the #ifdef to only wrap the omap2_prm functions that
> > need stubs on OMAP4-only builds.
> >
> > Cc: Paul Walmsley <paul@pwsan.com>
> > Signed-off-by: Kevin Hilman <khilman@ti.com>
> > ---
> > Paul, this patch applies on top your io_chain_devel_3.5 branch.
>
> Thanks, Tony reported this too. Any objections to me rolling this into
> the offending patch?
I heard of this first from Kevin before I started hitting it with
my compiles..
Anyways, can you also check that we don't have a similar issue
with omap44xx_prm_reconfigure_io_chain for omap3 only builds?
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
2012-04-05 22:53 ` Tony Lindgren
@ 2012-04-05 23:37 ` Paul Walmsley
0 siblings, 0 replies; 6+ messages in thread
From: Paul Walmsley @ 2012-04-05 23:37 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 5 Apr 2012, Tony Lindgren wrote:
> I heard of this first from Kevin before I started hitting it with
> my compiles..
Okay.
> Anyways, can you also check that we don't have a similar issue
> with omap44xx_prm_reconfigure_io_chain for omap3 only builds?
Will do. Clearly I need to be running the full build-test suite on all of
my branches, as I was doing before the arm-soc transition.
Future pull requests from me will be test-built with a large variety of
kernel .configs, and will contain a 'size' report for each generated
binary in the pull request.
- Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
2012-04-05 21:33 ` Paul Walmsley
2012-04-05 22:53 ` Tony Lindgren
@ 2012-04-06 0:07 ` Kevin Hilman
2012-04-09 16:51 ` Paul Walmsley
1 sibling, 1 reply; 6+ messages in thread
From: Kevin Hilman @ 2012-04-06 0:07 UTC (permalink / raw)
To: linux-arm-kernel
Paul Walmsley <paul@pwsan.com> writes:
> On Thu, 5 Apr 2012, Kevin Hilman wrote:
>
>> For OMAP4 only builds, the omap2_prm_* functions have dummy wrappers
>> to detect incorrect usage. However, several unrelated omap3 PRM
>> functions have made it inside the #else clause of the #ifdef wrapping
>> the omap2_prm stubs, causing them to disappear on OMAP4-only builds.
>>
>> This was unnoticed until the IO chain support was added and introduced
>> a new function in this section which is referenced by omap_hwmod.c:
>>
>> /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c: In function '_reconfigure_io_chain':
>> /work/kernel/omap/dev/arch/arm/mach-omap2/omap_hwmod.c:1665:3: error: implicit declaration of function 'omap3xxx_prm_reconfigure_io_chain' [-Werror=implicit-fungiction-declaration]
>>
>> Fix by using the #ifdef to only wrap the omap2_prm functions that
>> need stubs on OMAP4-only builds.
>>
>> Cc: Paul Walmsley <paul@pwsan.com>
>> Signed-off-by: Kevin Hilman <khilman@ti.com>
>> ---
>> Paul, this patch applies on top your io_chain_devel_3.5 branch.
>
> Thanks, Tony reported this too. Any objections to me rolling this into
> the offending patch?
No objections.
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build
2012-04-06 0:07 ` Kevin Hilman
@ 2012-04-09 16:51 ` Paul Walmsley
0 siblings, 0 replies; 6+ messages in thread
From: Paul Walmsley @ 2012-04-09 16:51 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, 5 Apr 2012, Kevin Hilman wrote:
> No objections.
Thanks, I took a closer look at this issue over the weekend, and realized
that I had misunderstood it. So, will take this patch as-is, as part of
the io_chain_devel_3.5 series; thanks for the great changelog.
Looking forward to dropping these old OMAP2/3 PRM stubs for OMAP4 soon,
they've been around for too long :-(
- Paul
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-09 16:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-05 21:20 [PATCH] ARM: OMAP2+: PRM: fix compile for OMAP4-only build Kevin Hilman
2012-04-05 21:33 ` Paul Walmsley
2012-04-05 22:53 ` Tony Lindgren
2012-04-05 23:37 ` Paul Walmsley
2012-04-06 0:07 ` Kevin Hilman
2012-04-09 16:51 ` Paul Walmsley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox