| Message ID | 1336461259-28596-1-git-send-email-santosh.shilimkar@ti.com |
|---|---|
| State | New |
| Headers | show |
* Santosh Shilimkar <santosh.shilimkar@ti.com> [120508 00:18]: > Tony, > > Please pull the following preparatory cleanup series to add OMAP5 minimal > support. Boot tested on OMAP2430 SDP, OMAP3430 SDP and OMAP4430 SDP platforms. > > I have dropped {[PATCH 7/7] ARM: OMAP4+: Add prm and cm base init function} > from this set since Paul is taking that one in his queue. OK thanks, pulling this into cleanup-soc and merging into cleanup branch with what we have in devel-hwmod. > P.S: While merging this series with linux-omap master, I saw one trivial > Makefile conflict. Yes that's with devel-hwmod, I'm basing cleanup branch on that so we have all the dependencies out of the way for adding omap5 and am33xx patches on top of the cleanup branch. Regards, Tony
* Hiremath, Vaibhav <hvaibhav@ti.com> [120510 01:37]: > On Wed, May 09, 2012 at 00:04:14, Tony Lindgren wrote: > > * Santosh Shilimkar <santosh.shilimkar@ti.com> [120508 00:18]: > > > Tony, > > > > > > Please pull the following preparatory cleanup series to add OMAP5 minimal > > > support. Boot tested on OMAP2430 SDP, OMAP3430 SDP and OMAP4430 SDP platforms. > > > > > > I have dropped {[PATCH 7/7] ARM: OMAP4+: Add prm and cm base init function} > > > from this set since Paul is taking that one in his queue. > > > > OK thanks, pulling this into cleanup-soc and merging into cleanup branch > > with what we have in devel-hwmod. > > > Tony, > > > Just observed that, while merging cleanup-soc into cleanup branch you have > missed couple of lines from Satosh's original patch. Which leads to build > break on OMAP2 alone build. OK thanks for letting me know, will take a look. Tony > Can you please merge below change, > > diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile > index 833f153..c82783a 100644 > --- a/arch/arm/mach-omap2/Makefile > +++ b/arch/arm/mach-omap2/Makefile > @@ -122,6 +122,8 @@ obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common) > clockdomain-common += clockdomain.o > clockdomain-common += clockdomains_common_data.o > obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common) > +obj-$(CONFIG_ARCH_OMAP2) += clockdomain2xxx_3xxx.o > +obj-$(CONFIG_ARCH_OMAP2) += clockdomains2xxx_3xxx_data.o > obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o > obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o > obj-$(CONFIG_ARCH_OMAP3) += $(clockdomain-common) > > > Thanks, > Vaibhav
Tony, Please pull the following preparatory cleanup series to add OMAP5 minimal support. Boot tested on OMAP2430 SDP, OMAP3430 SDP and OMAP4430 SDP platforms. I have dropped {[PATCH 7/7] ARM: OMAP4+: Add prm and cm base init function} from this set since Paul is taking that one in his queue. P.S: While merging this series with linux-omap master, I saw one trivial Makefile conflict. The following changes since commit 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a: Linux 3.4-rc5 (2012-04-29 15:19:10 -0700) are available in the git repository at: git://gitorious.org/omap-sw-develoment/linux-omap-dev.git for_3.5/omap_misc_cleanup R Sricharan (1): ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them. Santosh Shilimkar (6): ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds. ARM: OMAP2+: Clean up wrapping multiple objects in Makefile ARM: OMAP4: Remove un-used WakeupGen register defines. ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching. ARM: All OMAP2PLUS machines use omap2 directory so just add one entry ARM: OMAP4: Reduce the static IO mapping arch/arm/Makefile | 4 +- arch/arm/mach-omap2/Makefile | 163 ++++++++++----------- arch/arm/mach-omap2/dma.c | 11 +- arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 8 - arch/arm/mach-omap2/io.c | 30 ---- arch/arm/mach-omap2/iomap.h | 28 ---- arch/arm/plat-omap/dma.c | 4 +- arch/arm/plat-omap/include/plat/dma.h | 5 + 8 files changed, 93 insertions(+), 160 deletions(-) Regards Santosh