Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc arch/arm/mach-omap1/common.h
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
index 46d9071f09386002fe06f11f0ed470b59a394787,f7cf382521d674b3ec865abb9bda4771a583a99e..ae87a3ea53aefd4d2ff014cca295dfe2301aaf91
--- 1/arch/arm/mach-omap2/Makefile
--- 2/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_apll.c
Simple merge

diff --cc arch/arm/mach-omap2/clkt2xxx_dpll.c
index 0890ba94a2821bedd9a6165a02fe4ee9ae47b88b,0f587794f00775e352e7ed0f6547926f3024148d..399534c7843b353800de1740239d8dceecb87033
--- 1/arch/arm/mach-omap2/clkt2xxx_dpll.c
--- 2/arch/arm/mach-omap2/clkt2xxx_dpll.c
+++ b/arch/arm/mach-omap2/clkt2xxx_dpll.c
@@@ -13,9 -13,11 +13,9 @@@
  #include <linux/errno.h>
  #include <linux/clk.h>
  #include <linux/io.h>
 -
 -#include <plat/clock.h>
  
  #include "clock.h"
- #include "cm2xxx_3xxx.h"
+ #include "cm2xxx.h"
  #include "cm-regbits-24xx.h"
  
  /* Private functions */

diff --cc arch/arm/mach-omap2/clock.c
Simple merge

diff --cc arch/arm/mach-omap2/clock2420_data.c
Simple merge

diff --cc arch/arm/mach-omap2/clock2430.c
Simple merge

diff --cc arch/arm/mach-omap2/clock2430_data.c
Simple merge

diff --cc arch/arm/mach-omap2/clock34xx.c
index baaaa4258708edad1810fce9c46b89ca98c15211,150f42bd22b7f8c89a38f9a8dd12d9a0a419ea6d..e41819ba748239d593ab5305e13334130532aa1a
--- 1/arch/arm/mach-omap2/clock34xx.c
--- 2/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@@ -21,9 -21,11 +21,9 @@@
  #include <linux/clk.h>
  #include <linux/io.h>
  
 -#include <plat/clock.h>
 -
  #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 80209050cd7ae5bcd1027ea0b34fdd72676c2145,3e610c81bf8e508bd8693b11f17f3f3e5b0069d2..622ea05026107dd4332341791c9f8c3a4ede5ee7
--- 1/arch/arm/mach-omap2/clock3517.c
--- 2/arch/arm/mach-omap2/clock3517.c
+++ b/arch/arm/mach-omap2/clock3517.c
@@@ -21,9 -21,11 +21,9 @@@
  #include <linux/clk.h>
  #include <linux/io.h>
  
 -#include <plat/clock.h>
 -
  #include "clock.h"
  #include "clock3517.h"
- #include "cm2xxx_3xxx.h"
+ #include "cm3xxx.h"
  #include "cm-regbits-34xx.h"
  
  /*

diff --cc arch/arm/mach-omap2/clock3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/cm33xx.c
index b4938abf28cc66d023b92df36ae7de002eaec6ed,9b3bcff127ff89e1e07ba9c9d75b9e48e3817d5a..b2dfcd777194119463d3e82e110f026ac489033c
--- 1/arch/arm/mach-omap2/cm33xx.c
--- 2/arch/arm/mach-omap2/cm33xx.c
+++ b/arch/arm/mach-omap2/cm33xx.c
@@@ -22,8 -22,9 +22,9 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
 -#include <plat/common.h>
 +#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/control.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/pm24xx.c
index 6d17e044ffb8d9836457f82b44a1c9f9c1316b26,02dca24ec0ab603ba4339dc559e826b8c156aadc..83815ddc47866daef00a93696a9796a949c906e1
--- 1/arch/arm/mach-omap2/pm24xx.c
--- 2/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@@ -36,16 -36,14 +36,16 @@@
  #include <asm/mach-types.h>
  #include <asm/system_misc.h>
  
 -#include <plat/clock.h>
 -#include <plat/sram.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
  
 +#include "../plat-omap/sram.h"
 +
 +#include "soc.h"
  #include "common.h"
- #include "prm2xxx_3xxx.h"
 +#include "clock.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 160fa250c41e2451a082571f4f85a10654442a11,c0f8a7804bf718903fc28af01276a1779b0b0984..2f1ad87c1bb076a2b1b124f493479446766e744d
--- 1/arch/arm/mach-omap2/pm34xx.c
--- 2/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -35,21 -35,19 +35,20 @@@
  #include <asm/suspend.h>
  #include <asm/system_misc.h>
  
 -#include <plat/sram.h>
  #include "clockdomain.h"
  #include "powerdomain.h"
 -#include <plat/sdrc.h>
  #include <plat/prcm.h>
 -#include <plat/gpmc.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
  
 +#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 624ade5c3c337b37e5578c605fc02c889a96fe3e,3417dd3a7c37341ac08af33175428348f1d0467b..53ec9cbaa3d3577ba40e6afd0952dd60f487076a
--- 1/arch/arm/mach-omap2/prm33xx.c
--- 2/arch/arm/mach-omap2/prm33xx.c
+++ b/arch/arm/mach-omap2/prm33xx.c
@@@ -19,9 -19,10 +19,10 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
 -#include <plat/common.h>
 +#include "../plat-omap/common.h"
  
  #include "common.h"
+ #include "powerdomain.h"
  #include "prm33xx.h"
  #include "prm-regbits-33xx.h"
  

diff --cc arch/arm/mach-omap2/prm_common.c
Simple merge

diff --cc arch/arm/mach-omap2/sdrc2xxx.c
Simple merge

diff --cc arch/arm/mach-omap2/sleep34xx.S
Simple merge