Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull ARM SoC multiplatform code updates from Arnd Bergmann:
 "This branch is the culmination of 5 years of effort to bring the ARMv6
  and ARMv7 platforms together such that they can all be enabled and
  boot the same kernel.  It has been a tremendous amount of cleanup and
  refactoring by a huge number of people, and creation of several new
  (and major) subsystems to better abstract out all the platform details
  in an appropriate manner.

  The bulk of this branch is a large patchset from Arnd that brings
  several of the more minor and older platforms we have closer to
  multiplatform support.  Among these are MMP, S3C64xx, Orion5x, mv78xx0
  and realview Much of this is moving around header files from old mach
  directories, but there are also some cleanup patches of debug_ll
  (lowlevel debug per-platform options) and other parts.

  Linus Walleij also has some patchs to clean up the older ARM Realview
  platforms by finally introducing DT support, and Rob Herring has some
  for ARM Versatile which is now DT-only.  Both of these platforms are
  now multiplatform.

  Finally, a couple of patches from Russell for Dove PMU, and a fix from
  Valentin Rothberg for Exynos ADC, which were rebased on top of the
  series to avoid conflicts"

* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: realview: don't select SMP_ON_UP for UP builds
  ARM: s3c: simplify s3c_irqwake_{e,}intallow definition
  ARM: s3c64xx: fix pm-debug compilation
  iio: exynos-adc: fix irqf_oneshot.cocci warnings
  ARM: realview: build realview-dt SMP support only when used
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
  ARM: make default platform work for NOMMU
  ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location
  ARM: defconfig: use correct debug_ll settings
  ARM: versatile: convert to multi-platform
  ARM: versatile: merge mach code into a single file
  ARM: versatile: switch to DT only booting and remove legacy code
  ARM: versatile: add DT based PCI detection
  ARM: pxa: mark ezx structures as __maybe_unused
  ARM: pxa: mark raumfeld init functions as __maybe_unused
  ...

diff --cc Documentation/devicetree/bindings/arm/cpus.txt
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

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

diff --cc arch/arm/mach-orion5x/ts78xx-setup.c
Simple merge

diff --cc arch/arm/mach-pxa/balloon3.c
Simple merge

diff --cc arch/arm/mach-pxa/devices.c
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/ezx.c
Simple merge

diff --cc arch/arm/mach-pxa/mioa701.c
index ccfd2b63c6a4e26587945c83a87f8979b9e57d9b,a315f6e3c4a64e025f4e1a68b70e66d09e60a423..38a96a193dc407e7d251ef8697740e0d6d560188
--- 1/arch/arm/mach-pxa/mioa701.c
--- 2/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@@ -52,9 -52,9 +52,9 @@@
  #include <linux/platform_data/keypad-pxa27x.h>
  #include <linux/platform_data/video-pxafb.h>
  #include <linux/platform_data/mmc-pxamci.h>
- #include <mach/udc.h>
- #include <mach/pxa27x-udc.h>
+ #include "udc.h"
+ #include "pxa27x-udc.h"
 -#include <linux/platform_data/camera-pxa.h>
 +#include <linux/platform_data/media/camera-pxa.h>
  #include <mach/audio.h>
  #include <mach/smemc.h>
  #include <media/soc_camera.h>

diff --cc arch/arm/mach-pxa/palmtreo.c
index 2dc56062fb7e91382bd87a065d4e716d044c4a67,b2aae54bed42ceb92c634cd1c11f2a22733dc10b..4cc05ecce6181755b2bb77b3e37589e0fcad3b35
--- 1/arch/arm/mach-pxa/palmtreo.c
--- 2/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@@ -43,8 -43,8 +43,8 @@@
  #include <linux/platform_data/usb-ohci-pxa27x.h>
  #include <mach/pxa2xx-regs.h>
  #include <linux/platform_data/asoc-palm27x.h>
 -#include <linux/platform_data/camera-pxa.h>
 +#include <linux/platform_data/media/camera-pxa.h>
- #include <mach/palm27x.h>
+ #include "palm27x.h"
  
  #include <sound/pxa2xx-lib.h>
  

diff --cc arch/arm/mach-pxa/palmtx.c
Simple merge

diff --cc arch/arm/mach-pxa/palmz72.c
index e3df17a7e8d4958778914e6631b57ff269ed5fdb,abba86f3e254e7c20de0989de8d73491ef5b2424..9c308de158c6fa2c0cf07a331c68292f8d4788b6
--- 1/arch/arm/mach-pxa/palmz72.c
--- 2/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@@ -44,12 -44,12 +44,12 @@@
  #include <linux/platform_data/video-pxafb.h>
  #include <linux/platform_data/irda-pxaficp.h>
  #include <linux/platform_data/keypad-pxa27x.h>
- #include <mach/udc.h>
+ #include "udc.h"
  #include <linux/platform_data/asoc-palm27x.h>
- #include <mach/palm27x.h>
+ #include "palm27x.h"
  
- #include <mach/pm.h>
+ #include "pm.h"
 -#include <linux/platform_data/camera-pxa.h>
 +#include <linux/platform_data/media/camera-pxa.h>
  
  #include <media/soc_camera.h>
  

diff --cc arch/arm/mach-pxa/pcm990-baseboard.c
index 8459239a093c8931007672b8a1edd46d0db4f25a,e802b112a255fe8f6c616c08b74d10c90c3b16a1..0bd5959ef7d55bddc64d18c998dbdac11f7d4303
--- 1/arch/arm/mach-pxa/pcm990-baseboard.c
--- 2/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@@ -27,12 -27,12 +27,12 @@@
  #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  
 -#include <media/mt9v022.h>
 +#include <media/i2c/mt9v022.h>
  #include <media/soc_camera.h>
  
 -#include <linux/platform_data/camera-pxa.h>
 +#include <linux/platform_data/media/camera-pxa.h>
  #include <asm/mach/map.h>
- #include <mach/pxa27x.h>
+ #include "pxa27x.h"
  #include <mach/audio.h>
  #include <linux/platform_data/mmc-pxamci.h>
  #include <linux/platform_data/usb-ohci-pxa27x.h>

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/arm/plat-samsung/devs.c
Simple merge

diff --cc arch/arm/plat-samsung/gpio-samsung.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/soc/Makefile
index 9536b804424a88dcc3b1d3585081c83d4bdf1ce6,d52872680f8654caed6793d8d311b8e48977838e..9b1c2e88dd0d3cb3dc1390356589014cd469b1d5
--- 1/drivers/soc/Makefile
--- 2/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -3,8 -3,8 +3,9 @@@
  #
  
  obj-$(CONFIG_SOC_BRCMSTB)     += brcmstb/
+ obj-$(CONFIG_ARCH_DOVE)               += dove/
  obj-$(CONFIG_MACH_DOVE)               += dove/
 +obj-y                         += fsl/
  obj-$(CONFIG_ARCH_MEDIATEK)   += mediatek/
  obj-$(CONFIG_ARCH_QCOM)               += qcom/
  obj-$(CONFIG_ARCH_ROCKCHIP)           += rockchip/