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

Pull ARM SoC platform updates from Olof Johansson:
 "New or improved SoC support:

   - add support for Atmel's SAMA5D2 SoC
   - add support for Freescale i.MX6UL
   - improved support for TI's DM814x platform
   - misc fixes and improvements for RockChip platforms
   - Marvell MVEBU suspend/resume support

  A few driver changes that ideally would belong in the drivers branch
  are also here (acked by appropriate maintainers):

   - power key input driver for Freescale platforms (svns)
   - RTC driver updates for Freescale platforms (svns/mxc)
   - clk fixes for TI DM814/816X

  + a bunch of other changes for various platforms"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: rockchip: pm: Fix PTR_ERR() argument
  ARM: imx: mach-imx6ul: Fix allmodconfig build
  clk: ti: fix for definition movement
  ARM: uniphier: drop v7_invalidate_l1 call at secondary entry
  memory: kill off set_irq_flags usage
  rtc: snvs: select option REGMAP_MMIO
  ARM: brcmstb: select ARCH_DMA_ADDR_T_64BIT for LPAE
  ARM: BCM: Enable ARM erratum 798181 for BRCMSTB
  ARM: OMAP2+: Fix power domain operations regression caused by 81xx
  ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend
  ARM: rockchip: set correct stabilization thresholds in suspend
  ARM: rockchip: rename osc_switch_to_32k variable
  ARM: imx6ul: add fec MAC refrence clock and phy fixup init
  ARM: imx6ul: add fec bits to GPR syscon definition
  rtc: mxc: add support of device tree
  dt-binding: document the binding for mxc rtc
  rtc: mxc: use a second rtc clock
  ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback
  soc: mediatek: Fix SCPSYS compilation
  ARM: at91/soc: add basic support for new sama5d2 SoC
  ...

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

diff --cc Documentation/devicetree/bindings/crypto/fsl-sec4.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/sama5.c
index 8fc47630bbc8e7771a234ec498701432382beed5,90c3c3051ae752880f9d12c24153ae0a639b5373..d9cf6799aec00d31b4974b00fddb6a956c17f205
--- 1/arch/arm/mach-at91/sama5.c
--- 2/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@@ -63,7 -65,8 +65,8 @@@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5
        .dt_compat      = sama5_dt_board_compat,
  MACHINE_END
  
 -static const char *sama5_alt_dt_board_compat[] __initconst = {
 +static const char *const sama5_alt_dt_board_compat[] __initconst = {
+       "atmel,sama5d2",
        "atmel,sama5d4",
        NULL
  };

diff --cc arch/arm/mach-davinci/cp_intc.c
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

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

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

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

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

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc drivers/clk/ti/Makefile
index 9b93e6904359ddd465712a291da1f43b9fefc735,80b42884a0e971042dd70d66dbab86e785eca91c..d4ac96087ccd01c3ae83f0218fd16d42f78a7ec5
--- 1/drivers/clk/ti/Makefile
--- 2/drivers/clk/ti/Makefile
+++ b/drivers/clk/ti/Makefile
@@@ -1,19 -1,16 +1,19 @@@
  obj-y                                 += clk.o autoidle.o clockdomain.o
  clk-common                            = dpll.o composite.o divider.o gate.o \
 -                                        fixed-factor.o mux.o apll.o
 -obj-$(CONFIG_SOC_AM33XX)              += $(clk-common) clk-33xx.o
 +                                        fixed-factor.o mux.o apll.o \
 +                                        clkt_dpll.o clkt_iclk.o clkt_dflt.o
 +obj-$(CONFIG_SOC_AM33XX)              += $(clk-common) clk-33xx.o dpll3xxx.o
- obj-$(CONFIG_SOC_TI81XX)              += $(clk-common) fapll.o clk-816x.o
+ obj-$(CONFIG_SOC_TI81XX)              += $(clk-common) fapll.o clk-814x.o clk-816x.o
  obj-$(CONFIG_ARCH_OMAP2)              += $(clk-common) interface.o clk-2xxx.o
  obj-$(CONFIG_ARCH_OMAP3)              += $(clk-common) interface.o \
 -                                         clk-3xxx.o
 -obj-$(CONFIG_ARCH_OMAP4)              += $(clk-common) clk-44xx.o
 -obj-$(CONFIG_SOC_OMAP5)                       += $(clk-common) clk-54xx.o
 +                                         clk-3xxx.o dpll3xxx.o
 +obj-$(CONFIG_ARCH_OMAP4)              += $(clk-common) clk-44xx.o \
 +                                         dpll3xxx.o dpll44xx.o
 +obj-$(CONFIG_SOC_OMAP5)                       += $(clk-common) clk-54xx.o \
 +                                         dpll3xxx.o dpll44xx.o
  obj-$(CONFIG_SOC_DRA7XX)              += $(clk-common) clk-7xx.o \
 -                                         clk-dra7-atl.o
 -obj-$(CONFIG_SOC_AM43XX)              += $(clk-common) clk-43xx.o
 +                                         clk-dra7-atl.o dpll3xxx.o dpll44xx.o
 +obj-$(CONFIG_SOC_AM43XX)              += $(clk-common) dpll3xxx.o clk-43xx.o
  
  ifdef CONFIG_ATAGS
  obj-$(CONFIG_ARCH_OMAP3)                += clk-3xxx-legacy.o

diff --cc drivers/clk/ti/clk-816x.c
Simple merge

diff --cc drivers/memory/omap-gpmc.c
Simple merge

diff --cc include/linux/clk/ti.h
Simple merge