From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Nov 2012 03:17:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'arm-soc/for-next'
X-Git-Tag: next-20121112~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d99f44ef652b1b42426fcd34dd97fe4785d36e9;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-nomadik/board-nhk8815.c
	arch/arm/mach-omap2/drm.c
	arch/arm/mach-ux500/board-mop500-audio.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/cpu-db8500.c
	drivers/pinctrl/pinctrl-nomadik.c
---

6d99f44ef652b1b42426fcd34dd97fe4785d36e9
diff --cc arch/arm/Kconfig
index deae5e325373,ac00c9b8c1e7..acc1f79fa4d9
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -367,8 -364,6 +367,7 @@@ config ARCH_CNS3XX
  
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
 +	select ARCH_REQUIRE_GPIOLIB
- 	select ARCH_USES_GETTIMEOFFSET
  	select CLKDEV_LOOKUP
  	select COMMON_CLK
  	select CPU_ARM720T
diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index ab7104fded39,5ccdf53c5a9d..9f19069248da
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -26,15 -25,16 +26,14 @@@
  #include <linux/io.h>
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/pinctrl-nomadik.h>
+ #include <linux/platform_data/clocksource-nomadik-mtu.h>
 -#include <linux/platform_data/mtd-nomadik-nand.h>
  #include <asm/hardware/vic.h>
  #include <asm/sizes.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
- #include <asm/mach/irq.h>
  #include <asm/mach/flash.h>
  #include <asm/mach/time.h>
- 
- #include <plat/mtu.h>
 -#include <mach/fsmc.h>
+ #include <mach/irqs.h>
  
  #include "cpu-8815.h"
  
diff --cc arch/arm/mach-omap2/drm.c
index 49a7ffb716a5,6282cc826613..fce5aa3fff49
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@@ -23,11 -23,9 +23,11 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
 +#include <linux/platform_data/omap_drm.h>
  
- #include <plat/omap_device.h>
- #include <plat/omap_hwmod.h>
+ #include "omap_device.h"
+ #include "omap_hwmod.h"
 +#include <plat/cpu.h>
  
  #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
  
diff --cc drivers/mmc/host/omap_hsmmc.c
index 5434fd8e088a,9b24bd46aad3..7546cb2a2511
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -37,11 -37,8 +37,9 @@@
  #include <linux/io.h>
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pm_runtime.h>
- #include <mach/hardware.h>
- #include <plat/mmc.h>
- #include <plat/cpu.h>
+ #include <linux/platform_data/mmc-omap.h>
  
  /* OMAP HSMMC Host Controller Registers */
  #define OMAP_HSMMC_SYSSTATUS	0x0014
diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 6a95d0438b6a,3ad23fb042b4..238060e14623
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -30,10 -30,23 +30,9 @@@
  #include <linux/pinctrl/pinconf.h>
  /* Since we request GPIOs from ourself */
  #include <linux/pinctrl/consumer.h>
 -/*
 - * For the U8500 archs, use the PRCMU register interface, for the older
 - * Nomadik, provide some stubs. The functions using these will only be
 - * called on the U8500 series.
 - */
 -#ifdef CONFIG_ARCH_U8500
 -#include <linux/mfd/dbx500-prcmu.h>
 -#else
 -static inline u32 prcmu_read(unsigned int reg) {
 -	return 0;
 -}
 -static inline void prcmu_write(unsigned int reg, u32 value) {}
 -static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 -#endif
  #include <linux/platform_data/pinctrl-nomadik.h>
- 
  #include <asm/mach/irq.h>
- 
+ #include <mach/irqs.h>
  #include "pinctrl-nomadik.h"
  
  /*