Merge tag 'omap-for-v3.11/omap5-signed' of git://git.kernel.org/pub/scm/linux/kernel...

From Tony Lindgren:
Omap5 SoC data via Paul Walmsley <paul@pwsan.com:

Add support for the OMAP5 SoC family.

As part of the transition to DT, no board files will be used
for OMAP5.  The hwmod data is gradually being transitioned
away from arch/arm/mach-omap2: IRQ, DMA, and memory map data
has been moved to DT.  Hopefully the dev_attr and clock role
data will be the next step.

Basic test logs are available here, although not for OMAP5,
since I don't have an OMAP5 board:
http://www.pwsan.com/omap/testlogs/omap5_v3.10/20130608130949/

* tag 'omap-for-v3.11/omap5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP5: Remove unused include for ocp2scp
  ARM: OMAP5: Enable build and frameowrk initialisations
  ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data
  ARM: OMAP5: hwmod data: Create initial OMAP5 SOC hwmod data
  ARM: OMAP5: powerdomain data: Add OMAP54XX data and update the header
  ARM: OMAP5: clockdomain data: Add OMAP54XX data and update the header
  ARM: OMAP5: SCRM: Add OMAP54XX header file.
  ARM: OMAP5: PRCM: Add OMAP54XX local MPU PRCM registers
  ARM: OMAP4+: PRCM MPU: Move function prototypes to common header for re-use
  ARM: OMAP5: CM: Add OMAP54XX register and bitfield files
  ARM: OMAP4+: CM: Move function prototypes to common header for re-use
  ARM: OMAP5: PRM: Add OMAP54XX register and bitfield files
  ARM: OMAP4+: PRM: Move function prototypes to common header for re-use

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/Makefile
index 955b64323a0b25e7f6d4ac79657320e89dac9d8b,27448ab320fdab6ed8f2b86626d97407462035e1..f8bc62fd48fb53dac91ed656207f280ceaafc8db
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -131,8 -126,8 +131,9 @@@ obj-$(CONFIG_ARCH_OMAP4)           += $(voltaged
  obj-$(CONFIG_ARCH_OMAP4)              += voltagedomains44xx_data.o
  obj-$(CONFIG_SOC_AM33XX)              += $(voltagedomain-common)
  obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o
 +obj-$(CONFIG_SOC_AM43XX)              += $(voltagedomain-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(voltagedomain-common)
+ obj-$(CONFIG_SOC_OMAP5)                += voltagedomains54xx_data.o
  
  # OMAP powerdomain framework
  powerdomain-common                    += powerdomain.o powerdomain-common.o
@@@ -146,8 -141,8 +147,9 @@@ obj-$(CONFIG_ARCH_OMAP4)           += $(powerdom
  obj-$(CONFIG_ARCH_OMAP4)              += powerdomains44xx_data.o
  obj-$(CONFIG_SOC_AM33XX)              += $(powerdomain-common)
  obj-$(CONFIG_SOC_AM33XX)              += powerdomains33xx_data.o
 +obj-$(CONFIG_SOC_AM43XX)              += $(powerdomain-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(powerdomain-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += powerdomains54xx_data.o
  
  # PRCM clockdomain control
  clockdomain-common                    += clockdomain.o
@@@ -162,8 -157,8 +164,9 @@@ obj-$(CONFIG_ARCH_OMAP4)           += $(clockdom
  obj-$(CONFIG_ARCH_OMAP4)              += clockdomains44xx_data.o
  obj-$(CONFIG_SOC_AM33XX)              += $(clockdomain-common)
  obj-$(CONFIG_SOC_AM33XX)              += clockdomains33xx_data.o
 +obj-$(CONFIG_SOC_AM43XX)              += $(clockdomain-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(clockdomain-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += clockdomains54xx_data.o
  
  # Clock framework
  obj-$(CONFIG_ARCH_OMAP2)              += $(clock-common) clock2xxx.o

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