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

Conflicts:
	MAINTAINERS
	arch/arm/boot/dts/omap3-evm.dts
	arch/arm/mach-tegra/Kconfig
	arch/arm/mach-ux500/board-mop500.c

diff --cc MAINTAINERS
index 5a7ed4c3590e131ff07d35e6a2076b8905b2e574,83685591362a1679fa770424d1c7f68de1dc9856..2906f6af30b24a62683618b2e3efbf5f4da95708
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2838,10 -2829,8 +2846,10 @@@ M:    Terje Bergström <tbergstrom@nvidia.
  L:    dri-devel@lists.freedesktop.org
  L:    linux-tegra@vger.kernel.org
  T:    git git://anongit.freedesktop.org/tegra/linux.git
- S:    Maintained
+ S:    Supported
 +F:    drivers/gpu/drm/tegra/
  F:    drivers/gpu/host1x/
 +F:    include/linux/host1x.h
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/am33xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap3-beagle-xm.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
index ea4054bfdfd4964c57573813de9306f5f538c034,17a3618b190f14e58349fb99a653140e4ab1ca58..513f0c9466dbd3e55e0ceed2d1393217b2e5a57e
--- 1/arch/arm/boot/dts/omap4.dtsi
--- 2/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@@ -668,7 -665,25 +672,25 @@@
                        multipoint = <1>;
                        num-eps = <16>;
                        ram-bits = <12>;
 -                      ti,has-mailbox;
 +                      ctrl-module = <&omap_control_usbotg>;
                };
+ 
+               aes: aes@4b501000 {
+                       compatible = "ti,omap4-aes";
+                       ti,hwmods = "aes";
+                       reg = <0x4b501000 0xa0>;
+                       interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&sdma 111>, <&sdma 110>;
+                       dma-names = "tx", "rx";
+               };
+ 
+               des: des@480a5000 {
+                       compatible = "ti,omap4-des";
+                       ti,hwmods = "des";
+                       reg = <0x480a5000 0xa0>;
+                       interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&sdma 117>, <&sdma 116>;
+                       dma-names = "tx", "rx";
+               };
        };
  };

diff --cc arch/arm/boot/dts/omap5.dtsi
index c0ec6dce30fe2dd3e18e799fb1ce0f82f8a17c81,6192c458bea123dc75bce6cb433d229c456fdb22..6d0a1d5f3da73c3e13695de15c603ec8e4811d69
--- 1/arch/arm/boot/dts/omap5.dtsi
--- 2/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@@ -626,19 -626,15 +626,19 @@@
                        hw-caps-temp-alert;
                };
  
 -              omap_control_usb: omap-control-usb@4a002300 {
 -                      compatible = "ti,omap-control-usb";
 -                      reg = <0x4a002300 0x4>,
 -                            <0x4a002370 0x4>;
 -                      reg-names = "control_dev_conf", "phy_power_usb";
 -                      ti,type = <2>;
 +              omap_control_usb2phy: control-phy@4a002300 {
 +                      compatible = "ti,control-phy-usb2";
 +                      reg = <0x4a002300 0x4>;
 +                      reg-names = "power";
 +              };
 +
 +              omap_control_usb3phy: control-phy@4a002370 {
 +                      compatible = "ti,control-phy-pipe3";
 +                      reg = <0x4a002370 0x4>;
 +                      reg-names = "power";
                };
  
-               omap_dwc3@4a020000 {
+               usb3: omap_dwc3@4a020000 {
                        compatible = "ti,dwc3";
                        ti,hwmods = "usb_otg_ss";
                        reg = <0x4a020000 0x10000>;

diff --cc arch/arm/common/Makefile
Simple merge

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

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

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

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

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

diff --cc arch/arm/mach-exynos/common.c
index c17407b16d7c687292fa6e064978d9ca1699ea0a,a4e7ba82881025db51b05045a310f9c761e7dcf3..61d2906ccefb3660b3061bb1782576bd0a3ec78e
--- 1/arch/arm/mach-exynos/common.c
--- 2/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -26,11 -26,8 +26,9 @@@
  #include <linux/export.h>
  #include <linux/irqdomain.h>
  #include <linux/of_address.h>
- #include <linux/clocksource.h>
- #include <linux/clk-provider.h>
  #include <linux/irqchip/arm-gic.h>
  #include <linux/irqchip/chained_irq.h>
 +#include <linux/platform_device.h>
  
  #include <asm/proc-fns.h>
  #include <asm/exception.h>

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

diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
Simple merge

diff --cc arch/arm/mach-highbank/Kconfig
index e2ca238cf0ea7fef2d22d027eb04550356cbba26,fe98df44579cfa5c22c77ebd53dd9efbee15cf1e..92d2ad25d463fcc8a43411420e4ebb06ba42852c
--- 1/arch/arm/mach-highbank/Kconfig
--- 2/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@@ -8,11 -8,11 +8,11 @@@ config ARCH_HIGHBAN
        select ARM_AMBA
        select ARM_ERRATA_764369
        select ARM_ERRATA_775420
 -      select ARM_ERRATA_798181
 +      select ARM_ERRATA_798181 if SMP
        select ARM_GIC
+       select ARM_PSCI
        select ARM_TIMER_SP804
        select CACHE_L2X0
-       select CLKDEV_LOOKUP
        select COMMON_CLK
        select CPU_V7
        select GENERIC_CLOCKEVENTS

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

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

diff --cc arch/arm/mach-tegra/Kconfig
index f26428d8b62a18828a08cd0ff42bc08f35e5b206,56bb6c35d958b62dd971a4d9e70c435342d92d7d..f8d1276d18afca4fd3960a79af12b4cd425e8cf9
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -53,9 -51,9 +51,9 @@@ config ARCH_TEGRA_3x_SO
  
  config ARCH_TEGRA_114_SOC
        bool "Enable support for Tegra114 family"
-       select HAVE_ARM_ARCH_TIMER
 -      select ARM_ERRATA_798181
 +      select ARM_ERRATA_798181 if SMP
        select ARM_L1_CACHE_SHIFT_6
+       select HAVE_ARM_ARCH_TIMER
        select PINCTRL_TEGRA114
        help
          Support for NVIDIA Tegra T114 processor family, based on the

diff --cc arch/arm/mach-tegra/fuse.c
Simple merge

diff --cc arch/arm/mach-ux500/Kconfig
index 7a3fc1af6944b2cd9175a46f7c1749c83a090220,c67f8ad5ccd5d89eb087fbbf3a4ff75cc5039775..0034d2cd69734e7cad97bf11cbc4976a3b9790c5
--- 1/arch/arm/mach-ux500/Kconfig
--- 2/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@@ -16,24 -27,9 +27,8 @@@ config ARCH_U850
  
  if ARCH_U8500
  
- config UX500_SOC_COMMON
-       bool
-       default y
-       select ABX500_CORE
-       select AB8500_CORE
-       select ARM_ERRATA_754322
-       select ARM_ERRATA_764369 if SMP
-       select ARM_GIC
-       select CACHE_L2X0
-       select CLKSRC_NOMADIK_MTU
-       select COMMON_CLK
-       select PINCTRL
-       select PINCTRL_NOMADIK
-       select PINCTRL_ABX500
-       select PL310_ERRATA_753970 if CACHE_PL310
- 
  config UX500_SOC_DB8500
        bool
 -      select CPU_FREQ_TABLE if CPU_FREQ
        select MFD_DB8500_PRCMU
        select PINCTRL_DB8500
        select PINCTRL_DB8540

diff --cc drivers/block/Kconfig
Simple merge

diff --cc drivers/cpufreq/integrator-cpufreq.c
Simple merge

diff --cc drivers/cpuidle/Kconfig.arm
index f23bd75426cdfcac5da246ef6f23adef0a15b0da,d6f57d5d963181e1125c2aba5f938a48a9afa339..d988948a89a069510c32bda5ca79a1a422b8827b
--- 1/drivers/cpuidle/Kconfig.arm
--- 2/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@@ -2,20 -2,9 +2,20 @@@
  # ARM CPU Idle drivers
  #
  
 +config ARM_BIG_LITTLE_CPUIDLE
 +      bool "Support for ARM big.LITTLE processors"
 +      depends on ARCH_VEXPRESS_TC2_PM
 +      select ARM_CPU_SUSPEND
 +      select CPU_IDLE_MULTIPLE_DRIVERS
 +      help
 +        Select this option to enable CPU idle driver for big.LITTLE based
 +        ARM systems. Driver manages CPUs coordination through MCPM and
 +        define different C-states for little and big cores through the
 +        multiple CPU idle drivers infrastructure.
 +
  config ARM_HIGHBANK_CPUIDLE
        bool "CPU Idle Driver for Calxeda processors"
-       depends on ARCH_HIGHBANK
+       depends on ARM_PSCI
        select ARM_CPU_SUSPEND
        help
          Select this to enable cpuidle on Calxeda processors.

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/ide/Kconfig
Simple merge

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

diff --cc drivers/pci/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ohci-s3c2410.c
Simple merge

diff --cc drivers/usb/musb/ux500.c
Simple merge

diff --cc drivers/video/cyber2000fb.c
Simple merge