| Message ID | 20130801185956.GK8868@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 01 August 2013 02:59 PM, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: >> This one looks fine for me. Can you send above in >> a proper patch ? Let me know if you want me to >> send it. >> > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- Thanks Stephen Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: > > This one looks fine for me. Can you send above in > > a proper patch ? Let me know if you want me to > > send it. > > > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Please change this to be: Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > On 08/01, Santosh Shilimkar wrote: > > This one looks fine for me. Can you send above in > > a proper patch ? Let me know if you want me to > > send it. > > > > Here's a proper patch. Olof, can you please apply this on top of > the merge (and maybe you can fix the merge again to handle the > HAVE_CAN problem I mentioned earlier). > > ---8<--- > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > API, 2013-03-04) broke the omap build when SMP=n because the TWD > functions are only compiled on SMP=y builds. Stub out the TWD > calls when the TWD isn't built in to to keep everything building. > > arch/arm/mach-omap2/built-in.o: In function > `omap4_local_timer_init': > dss-common.c:(.init.text+0x1d90): undefined reference to > `twd_local_timer_register' > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Thanks, applied (with the reported-by changed as requested) -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/01, Olof Johansson wrote: > On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > > On 08/01, Santosh Shilimkar wrote: > > > This one looks fine for me. Can you send above in > > > a proper patch ? Let me know if you want me to > > > send it. > > > > > > > Here's a proper patch. Olof, can you please apply this on top of > > the merge (and maybe you can fix the merge again to handle the > > HAVE_CAN problem I mentioned earlier). > > > > ---8<--- > > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > > > > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > > API, 2013-03-04) broke the omap build when SMP=n because the TWD > > functions are only compiled on SMP=y builds. Stub out the TWD > > calls when the TWD isn't built in to to keep everything building. > > > > arch/arm/mach-omap2/built-in.o: In function > > `omap4_local_timer_init': > > dss-common.c:(.init.text+0x1d90): undefined reference to > > `twd_local_timer_register' > > > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > Thanks, applied (with the reported-by changed as requested) > It looks like somehow you became the author. Is there anyway you can fix that and possibly fix the merge before it to not add HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig?
On Fri, Aug 2, 2013 at 1:44 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 08/01, Olof Johansson wrote: >> On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: >> > On 08/01, Santosh Shilimkar wrote: >> > > This one looks fine for me. Can you send above in >> > > a proper patch ? Let me know if you want me to >> > > send it. >> > > >> > >> > Here's a proper patch. Olof, can you please apply this on top of >> > the merge (and maybe you can fix the merge again to handle the >> > HAVE_CAN problem I mentioned earlier). >> > >> > ---8<--- >> > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n >> > >> > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer >> > API, 2013-03-04) broke the omap build when SMP=n because the TWD >> > functions are only compiled on SMP=y builds. Stub out the TWD >> > calls when the TWD isn't built in to to keep everything building. >> > >> > arch/arm/mach-omap2/built-in.o: In function >> > `omap4_local_timer_init': >> > dss-common.c:(.init.text+0x1d90): undefined reference to >> > `twd_local_timer_register' >> > >> > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> >> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> >> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> >> >> Thanks, applied (with the reported-by changed as requested) >> > > It looks like somehow you became the author. Is there anyway you > can fix that and possibly fix the merge before it to not add > HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig? That's because the patch wasn't sent such that it could be applied with git am, and forgot to set authorship back. Fixed now. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 08/02, Olof Johansson wrote: > On Fri, Aug 2, 2013 at 1:44 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > > On 08/01, Olof Johansson wrote: > >> On Thu, Aug 01, 2013 at 11:59:56AM -0700, Stephen Boyd wrote: > >> > On 08/01, Santosh Shilimkar wrote: > >> > > This one looks fine for me. Can you send above in > >> > > a proper patch ? Let me know if you want me to > >> > > send it. > >> > > > >> > > >> > Here's a proper patch. Olof, can you please apply this on top of > >> > the merge (and maybe you can fix the merge again to handle the > >> > HAVE_CAN problem I mentioned earlier). > >> > > >> > ---8<--- > >> > Subject: [PATCH] ARM: OMAP2+: Fix fallout from localtimer divorce and SMP=n > >> > > >> > A recent patch ef3160c (ARM: OMAP2+: Divorce from local timer > >> > API, 2013-03-04) broke the omap build when SMP=n because the TWD > >> > functions are only compiled on SMP=y builds. Stub out the TWD > >> > calls when the TWD isn't built in to to keep everything building. > >> > > >> > arch/arm/mach-omap2/built-in.o: In function > >> > `omap4_local_timer_init': > >> > dss-common.c:(.init.text+0x1d90): undefined reference to > >> > `twd_local_timer_register' > >> > > >> > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > >> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > >> > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > >> > >> Thanks, applied (with the reported-by changed as requested) > >> > > > > It looks like somehow you became the author. Is there anyway you > > can fix that and possibly fix the merge before it to not add > > HAVE_CAN_FLEXCAN if CAN in mach-imx/Kconfig? > > That's because the patch wasn't sent such that it could be applied > with git am, and forgot to set authorship back. Fixed now. > Ah sorry, I thought you would use git am --scissors so it would keep the authorship from the sender. I'll just add From: in future scissored patches to make this simpler.
On Fri, Aug 2, 2013 at 1:56 PM, Stephen Boyd <sboyd@codeaurora.org> wrote: > Ah sorry, I thought you would use git am --scissors so it would > keep the authorship from the sender. I'll just add From: in > future scissored patches to make this simpler. Or move the discussion parts under the --- in the patch, that works too. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3b7caba..00dc53e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -600,6 +600,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", #endif #ifdef CONFIG_ARCH_OMAP4 +#ifdef CONFIG_HAVE_ARM_TWD static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29); void __init omap4_local_timer_init(void) { @@ -618,6 +619,12 @@ void __init omap4_local_timer_init(void) pr_err("twd_local_timer_register failed %d\n", err); } } +#else +void __init omap4_local_timer_init(void) +{ + omap4_sync32k_timer_init(); +} +#endif /* CONFIG_HAVE_ARM_TWD */ #endif /* CONFIG_ARCH_OMAP4 */ #ifdef CONFIG_SOC_OMAP5