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

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

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/cpu-db8500.c
---

a1264a9a6b2cbc694113d1a22af122b270fb5af2
diff --cc arch/arm/Kconfig
index bf3a132c69a1,ef6d059a0718..c406f262ef37
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -366,8 -364,6 +366,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/Makefile
index 554cfac41429,451757d85ee3..97252d86a701
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -196,9 -195,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)		+= zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
- plat-$(CONFIG_ARCH_MXC)		+= mxc
  plat-$(CONFIG_ARCH_OMAP)	+= omap
  plat-$(CONFIG_ARCH_S3C64XX)	+= samsung
 -plat-$(CONFIG_ARCH_ZYNQ)	+= versatile
  plat-$(CONFIG_PLAT_IOP)		+= iop
  plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik
  plat-$(CONFIG_PLAT_ORION)	+= orion
diff --cc arch/arm/mach-imx/clk-imx25.c
index 01e2f843bf2e,60d0902b1869..bc885801cd68
--- a/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@@ -203,18 -203,18 +203,18 @@@ int __init mx25_clocks_init(void
  	clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");
  	clk_register_clkdev(clk[cspi3_ipg], NULL, "imx35-cspi.2");
  	clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.0");
 -	clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.0");
 +	clk_register_clkdev(clk[per10], "per", "mxc_pwm.0");
  	clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.1");
 -	clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.1");
 +	clk_register_clkdev(clk[per10], "per", "mxc_pwm.1");
  	clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.2");
 -	clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.2");
 +	clk_register_clkdev(clk[per10], "per", "mxc_pwm.2");
  	clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.3");
 -	clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.3");
 +	clk_register_clkdev(clk[per10], "per", "mxc_pwm.3");
  	clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad");
  	clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc");
- 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.0");
- 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.1");
- 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.2");
+ 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.0");
+ 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.1");
+ 	clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.2");
  	clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0");
  	clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0");
  	clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0");
diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 87a8f9fbb100,50202a163e5d..ca7c7ed890d2
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -18,7 -18,7 +18,8 @@@
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
  #include <linux/platform_data/usb-musb-ux500.h>
 +#include <linux/platform_data/pinctrl-nomadik.h>
+ #include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>
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