Re: [PATCH] ARM: OMAP: Introduce local common.h files
* Russell King - ARM Linux [11 07:42]: > On Thu, Nov 10, 2011 at 03:33:47PM -0800, Tony Lindgren wrote: > > * Russell King - ARM Linux [10 13:54]: > > > Thanks, merged that into the series. The updated OMAP patch updated is > > > below, which has been moved to part 2. Lastly, the final patch of part > > > 2 has been updated to delete the empty arch_reset(), so OMAP is now > > > entirely free of arch_reset() references. This leaves a total of 12 > > > references left to nobble. > > > > Great, good to hear. > > I've added this to the patch, as these no longer need to include this > header. OK thanks. Tony > diff --git a/arch/arm/mach-omap1/board-voiceblue.c > b/arch/arm/mach-omap1/board-voiceblue.c > index fb61434..f83a502d 100644 > --- a/arch/arm/mach-omap1/board-voiceblue.c > +++ b/arch/arm/mach-omap1/board-voiceblue.c > @@ -28,7 +28,6 @@ > #include > > #include > -#include > #include > #include > #include > diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c > index 8b1cc6e..91d199b 100644 > --- a/arch/arm/mach-omap1/reset.c > +++ b/arch/arm/mach-omap1/reset.c > @@ -5,7 +5,6 @@ > #include > > #include > -#include > #include > > void omap1_restart(char mode, const char *cmd) > diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c > index b6c8cb5..626acfa 100644 > --- a/arch/arm/mach-omap2/prcm.c > +++ b/arch/arm/mach-omap2/prcm.c > @@ -25,7 +25,6 @@ > #include > #include > > -#include > #include "common.h" > #include > #include > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: Introduce local common.h files
On Thu, Nov 10, 2011 at 03:33:47PM -0800, Tony Lindgren wrote: > * Russell King - ARM Linux [10 13:54]: > > Thanks, merged that into the series. The updated OMAP patch updated is > > below, which has been moved to part 2. Lastly, the final patch of part > > 2 has been updated to delete the empty arch_reset(), so OMAP is now > > entirely free of arch_reset() references. This leaves a total of 12 > > references left to nobble. > > Great, good to hear. I've added this to the patch, as these no longer need to include this header. diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index fb61434..f83a502d 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -28,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/mach-omap1/reset.c b/arch/arm/mach-omap1/reset.c index 8b1cc6e..91d199b 100644 --- a/arch/arm/mach-omap1/reset.c +++ b/arch/arm/mach-omap1/reset.c @@ -5,7 +5,6 @@ #include #include -#include #include void omap1_restart(char mode, const char *cmd) diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index b6c8cb5..626acfa 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -25,7 +25,6 @@ #include #include -#include #include "common.h" #include #include -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: Introduce local common.h files
* Russell King - ARM Linux [10 13:54]: > On Thu, Nov 10, 2011 at 01:50:09PM -0800, Tony Lindgren wrote: > > * Russell King - ARM Linux [10 11:49]: > > > > OK, a stable branch is needed badly for this.. If possible please > > publish some minimal stable base branch as soon as you can as pretty > > much all omap patches need to be updated for this one. > > I want to give it something between a week and two before closing the > window for acked-bys etc (amongst other reasons). OK > > > If you agree, could you put it in the patch system please? Thanks. > > > > Sounds good to me, it there now as patch 7159/1. > > Thanks, merged that into the series. The updated OMAP patch updated is > below, which has been moved to part 2. Lastly, the final patch of part > 2 has been updated to delete the empty arch_reset(), so OMAP is now > entirely free of arch_reset() references. This leaves a total of 12 > references left to nobble. Great, good to hear. > 8<--- > From: Russell King - ARM Linux > Subject: [PATCH] ARM: restart: omap: use new restart hook > > Hook these platforms restart code into the new restart hook rather > than using arch_reset(). > > Signed-off-by: Russell King Acked-by: Tony Lindgren -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: Introduce local common.h files
On Thu, Nov 10, 2011 at 01:50:09PM -0800, Tony Lindgren wrote: > * Russell King - ARM Linux [10 11:49]: > > On Thu, Nov 10, 2011 at 12:17:19PM -0800, Tony Lindgren wrote: > > > As suggested by Russell King - ARM Linux , > > > there's no need to keep local prototypes in non-local headers. > > > > > > Add mach-omap1/common.h and mach-omap2/common.h and move the > > > local prototypes there from plat/common.h and mach/omap4-common.h. > > > > > > Signed-off-by: Tony Lindgren > > > > Great, looks fine, thanks. I suspect the chance of conflicts on this are > > about the same as the chance of conflicts with the rest of the restart > > series (in that, new platforms will need to be fixed for both these > > changes.) > > > > So, I suggest that I add it to my series so I can fix the OMAP changes > > there so stuff still builds - and then I can see about publishing a more > > stable branch in a couple of weeks for new platforms to base on. > > OK, a stable branch is needed badly for this.. If possible please > publish some minimal stable base branch as soon as you can as pretty > much all omap patches need to be updated for this one. I want to give it something between a week and two before closing the window for acked-bys etc (amongst other reasons). > > If you agree, could you put it in the patch system please? Thanks. > > Sounds good to me, it there now as patch 7159/1. Thanks, merged that into the series. The updated OMAP patch updated is below, which has been moved to part 2. Lastly, the final patch of part 2 has been updated to delete the empty arch_reset(), so OMAP is now entirely free of arch_reset() references. This leaves a total of 12 references left to nobble. 8<--- From: Russell King - ARM Linux Subject: [PATCH] ARM: restart: omap: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King --- arch/arm/mach-omap1/board-ams-delta.c |1 + arch/arm/mach-omap1/board-fsample.c|1 + arch/arm/mach-omap1/board-generic.c|1 + arch/arm/mach-omap1/board-h2.c |1 + arch/arm/mach-omap1/board-h3.c |1 + arch/arm/mach-omap1/board-htcherald.c |1 + arch/arm/mach-omap1/board-innovator.c |1 + arch/arm/mach-omap1/board-nokia770.c |1 + arch/arm/mach-omap1/board-osk.c|1 + arch/arm/mach-omap1/board-palmte.c |1 + arch/arm/mach-omap1/board-palmtt.c |1 + arch/arm/mach-omap1/board-palmz71.c|1 + arch/arm/mach-omap1/board-perseus2.c |1 + arch/arm/mach-omap1/board-sx1.c|1 + arch/arm/mach-omap1/board-voiceblue.c |5 ++--- arch/arm/mach-omap1/common.h |1 + arch/arm/mach-omap1/reset.c|4 +--- arch/arm/mach-omap2/board-2430sdp.c|1 + arch/arm/mach-omap2/board-3430sdp.c|1 + arch/arm/mach-omap2/board-3630sdp.c|1 + arch/arm/mach-omap2/board-4430sdp.c|1 + arch/arm/mach-omap2/board-am3517crane.c|1 + arch/arm/mach-omap2/board-am3517evm.c |1 + arch/arm/mach-omap2/board-apollon.c|1 + arch/arm/mach-omap2/board-cm-t35.c |2 ++ arch/arm/mach-omap2/board-cm-t3517.c |1 + arch/arm/mach-omap2/board-devkit8000.c |1 + arch/arm/mach-omap2/board-generic.c|4 arch/arm/mach-omap2/board-h4.c |1 + arch/arm/mach-omap2/board-igep0020.c |2 ++ arch/arm/mach-omap2/board-ldp.c|1 + arch/arm/mach-omap2/board-n8x0.c |3 +++ arch/arm/mach-omap2/board-omap3beagle.c|1 + arch/arm/mach-omap2/board-omap3evm.c |1 + arch/arm/mach-omap2/board-omap3logic.c |2 ++ arch/arm/mach-omap2/board-omap3pandora.c |1 + arch/arm/mach-omap2/board-omap3stalker.c |1 + arch/arm/mach-omap2/board-omap3touchbook.c |1 + arch/arm/mach-omap2/board-omap4panda.c |1 + arch/arm/mach-omap2/board-overo.c |1 + arch/arm/mach-omap2/board-rm680.c |1 + arch/arm/mach-omap2/board-rx51.c |1 + arch/arm/mach-omap2/board-ti8168evm.c |1 + arch/arm/mach-omap2/board-zoom.c |2 ++ arch/arm/mach-omap2/common.h |1 + arch/arm/mach-omap2/prcm.c |4 +--- arch/arm/plat-omap/include/plat/system.h |4 +++- 47 files changed, 59 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 1b37400..2120369 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -382,6 +382,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") .init_irq = omap1_init_irq, .init_machine = ams_delta_init, .timer = &omap1_timer, + .restart= omap1_restart, MACHINE_END EXPORT_SYMBOL(ams_delta_latch1_write); d
Re: [PATCH] ARM: OMAP: Introduce local common.h files
* Russell King - ARM Linux [10 11:49]: > On Thu, Nov 10, 2011 at 12:17:19PM -0800, Tony Lindgren wrote: > > As suggested by Russell King - ARM Linux , > > there's no need to keep local prototypes in non-local headers. > > > > Add mach-omap1/common.h and mach-omap2/common.h and move the > > local prototypes there from plat/common.h and mach/omap4-common.h. > > > > Signed-off-by: Tony Lindgren > > Great, looks fine, thanks. I suspect the chance of conflicts on this are > about the same as the chance of conflicts with the rest of the restart > series (in that, new platforms will need to be fixed for both these > changes.) > > So, I suggest that I add it to my series so I can fix the OMAP changes > there so stuff still builds - and then I can see about publishing a more > stable branch in a couple of weeks for new platforms to base on. OK, a stable branch is needed badly for this.. If possible please publish some minimal stable base branch as soon as you can as pretty much all omap patches need to be updated for this one. > If you agree, could you put it in the patch system please? Thanks. Sounds good to me, it there now as patch 7159/1. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: Introduce local common.h files
On Thu, Nov 10, 2011 at 12:17:19PM -0800, Tony Lindgren wrote: > As suggested by Russell King - ARM Linux , > there's no need to keep local prototypes in non-local headers. > > Add mach-omap1/common.h and mach-omap2/common.h and move the > local prototypes there from plat/common.h and mach/omap4-common.h. > > Signed-off-by: Tony Lindgren Great, looks fine, thanks. I suspect the chance of conflicts on this are about the same as the chance of conflicts with the rest of the restart series (in that, new platforms will need to be fixed for both these changes.) So, I suggest that I add it to my series so I can fix the OMAP changes there so stuff still builds - and then I can see about publishing a more stable branch in a couple of weeks for new platforms to base on. If you agree, could you put it in the patch system please? Thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
