From: Tony Lindgren Date: Thu, 25 Oct 2012 00:05:59 +0000 (-0700) Subject: Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: upstream/snapshot3+hdmi~6093^2~1^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8634155ef41d3a035f2ea0b6c5bed2806f2788bc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'omap-cleanup-a-for-3.8' of git://git./linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-prcm The first set of OMAP PRM/CM-related cleanup patches for 3.8. Prepares for the future move of the PRM/CM code to drivers/. Also includes some prcm.[ch] cleanup patches from the WDTIMER cleanup series that don't need external acks. Basic test logs for this branch on top of v3.7-rc2 are here: http://www.pwsan.com/omap/testlogs/prcm_cleanup_a_3.8/20121021123719/ But due to the number of unrelated regressions present in v3.7-rc[12], it's not particularly usable as a testing base. With reverts, fixes, and workarounds applied as documented in: http://www.pwsan.com/omap/testlogs/test_v3.7-rc2/20121020134755/README.txt the following test logs were obtained: http://www.pwsan.com/omap/testlogs/prcm_cleanup_a_3.8/20121020231757/ which indicate that the series tests cleanly. Conflicts: arch/arm/mach-omap2/Makefile arch/arm/mach-omap2/clockdomain2xxx_3xxx.c arch/arm/mach-omap2/pm24xx.c --- 8634155ef41d3a035f2ea0b6c5bed2806f2788bc diff --cc arch/arm/mach-omap2/Makefile index 46d9071,f7cf382..ae87a3e --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@@ -4,18 -4,20 +4,21 @@@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ - common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o + common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \ + omap_device.o - # INTCPS IP block support - XXX should be moved to drivers/ - obj-$(CONFIG_ARCH_OMAP2) += irq.o - obj-$(CONFIG_ARCH_OMAP3) += irq.o - obj-$(CONFIG_SOC_AM33XX) += irq.o - - # Secure monitor API support - obj-$(CONFIG_ARCH_OMAP3) += omap-smc.o omap-secure.o - obj-$(CONFIG_ARCH_OMAP4) += omap-smc.o omap-secure.o - obj-$(CONFIG_SOC_OMAP5) += omap-smc.o omap-secure.o + omap-2-3-common = irq.o + hwmod-common = omap_hwmod.o \ + omap_hwmod_common_data.o + clock-common = clock.o clock_common_data.o \ + clkt_dpll.o clkt_clksel.o + secure-common = omap-smc.o omap-secure.o + + obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) + obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) + obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) + obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common) + obj-$(CONFIG_SOC_OMAP5) += prm44xx.o $(hwmod-common) $(secure-common) ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) obj-y += mcbsp.o diff --cc arch/arm/mach-omap2/clkt2xxx_dpll.c index 0890ba9,0f58779..399534c --- a/arch/arm/mach-omap2/clkt2xxx_dpll.c +++ b/arch/arm/mach-omap2/clkt2xxx_dpll.c @@@ -13,9 -13,11 +13,9 @@@ #include #include #include - -#include #include "clock.h" - #include "cm2xxx_3xxx.h" + #include "cm2xxx.h" #include "cm-regbits-24xx.h" /* Private functions */ diff --cc arch/arm/mach-omap2/clock34xx.c index baaaa42,150f42b..e41819b --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@@ -21,9 -21,11 +21,9 @@@ #include #include -#include - #include "clock.h" #include "clock34xx.h" - #include "cm2xxx_3xxx.h" + #include "cm3xxx.h" #include "cm-regbits-34xx.h" /** diff --cc arch/arm/mach-omap2/clock3517.c index 8020905,3e610c8..622ea05 --- a/arch/arm/mach-omap2/clock3517.c +++ b/arch/arm/mach-omap2/clock3517.c @@@ -21,9 -21,11 +21,9 @@@ #include #include -#include - #include "clock.h" #include "clock3517.h" - #include "cm2xxx_3xxx.h" + #include "cm3xxx.h" #include "cm-regbits-34xx.h" /* diff --cc arch/arm/mach-omap2/cm33xx.c index b4938ab,9b3bcff..b2dfcd7 --- a/arch/arm/mach-omap2/cm33xx.c +++ b/arch/arm/mach-omap2/cm33xx.c @@@ -22,8 -22,9 +22,9 @@@ #include #include -#include +#include "../plat-omap/common.h" + #include "clockdomain.h" #include "cm.h" #include "cm33xx.h" #include "cm-regbits-34xx.h" diff --cc arch/arm/mach-omap2/pm24xx.c index 6d17e044,02dca24..83815dd --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c @@@ -36,16 -36,14 +36,16 @@@ #include #include -#include -#include -#include +#include +#include "../plat-omap/sram.h" + +#include "soc.h" #include "common.h" +#include "clock.h" - #include "prm2xxx_3xxx.h" + #include "prm2xxx.h" #include "prm-regbits-24xx.h" - #include "cm2xxx_3xxx.h" + #include "cm2xxx.h" #include "cm-regbits-24xx.h" #include "sdrc.h" #include "pm.h" diff --cc arch/arm/mach-omap2/pm34xx.c index 160fa25,c0f8a78..2f1ad87 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@@ -35,21 -35,19 +35,20 @@@ #include #include -#include #include "clockdomain.h" #include "powerdomain.h" -#include #include -#include -#include +#include +#include "../plat-omap/sram.h" + +#include "soc.h" #include "common.h" - #include "cm2xxx_3xxx.h" + #include "cm3xxx.h" #include "cm-regbits-34xx.h" +#include "gpmc.h" #include "prm-regbits-34xx.h" - - #include "prm2xxx_3xxx.h" + #include "prm3xxx.h" #include "pm.h" #include "sdrc.h" #include "control.h" diff --cc arch/arm/mach-omap2/prm33xx.c index 624ade5,3417dd3..53ec9cb --- a/arch/arm/mach-omap2/prm33xx.c +++ b/arch/arm/mach-omap2/prm33xx.c @@@ -19,9 -19,10 +19,10 @@@ #include #include -#include +#include "../plat-omap/common.h" #include "common.h" + #include "powerdomain.h" #include "prm33xx.h" #include "prm-regbits-33xx.h"