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

Pull ARM SoC platform support updates from Kevin Hilman:
 "Our SoC branch usually contains expanded support for new SoCs and
  other core platform code.  Some highlights from this round:

   - sunxi: SMP support for A23 SoC
   - socpga: big-endian support
   - pxa: conversion to common clock framework
   - bcm: SMP support for BCM63138
   - imx: support new I.MX7D SoC
   - zte: basic support for ZX296702 SoC"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits)
  ARM: zx: Add basic defconfig support for ZX296702
  ARM: dts: zx: add an initial zx296702 dts and doc
  clk: zx: add clock support to zx296702
  dt-bindings: Add #defines for ZTE ZX296702 clocks
  ARM: socfpga: fix build error due to secondary_startup
  MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS
  ARM: ep93xx: simone: support for SPI-based MMC/SD cards
  MAINTAINERS: update Shawn's email to use kernel.org one
  ARM: socfpga: support suspend to ram
  ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10
  ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5
  ARM: EXYNOS: register power domain driver from core_initcall
  ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs
  ARM: SAMSUNG: Constify platform_device_id
  ARM: EXYNOS: Constify irq_domain_ops
  ARM: EXYNOS: add coupled cpuidle support for Exynos3250
  ARM: EXYNOS: add exynos_get_boot_addr() helper
  ARM: EXYNOS: add exynos_set_boot_addr() helper
  ARM: EXYNOS: make exynos_core_restart() less verbose
  ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout
  ...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
index 5f2956c,4052a54..eaa1312
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1508,9 -1501,16 +1517,17 @@@ F:    drivers/tty/serial/st-asc.
  F:    drivers/usb/dwc3/dwc3-st.c
  F:    drivers/usb/host/ehci-st.c
  F:    drivers/usb/host/ohci-st.c
 +F:    drivers/watchdog/st_lpc_wdt.c
  F:    drivers/ata/ahci_st.c
  
+ ARM/STM32 ARCHITECTURE
+ M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
+ N:    stm32
+ F:    drivers/clocksource/armv7m_systick.c
+ 
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-pxa/eseries.c
index 4427bf2,11863be..16dc95f
--- 1/arch/arm/mach-pxa/eseries.c
--- 2/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@@ -10,9 -10,9 +10,10 @@@
   *
   */
  
 +#include <linux/clkdev.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
+ #include <linux/clk-provider.h>
  #include <linux/gpio.h>
  #include <linux/delay.h>
  #include <linux/platform_device.h>

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

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

diff --cc arch/arm/mach-socfpga/core.h
index 767c09e,2484179..7259c37
--- 1/arch/arm/mach-socfpga/core.h
--- 2/arch/arm/mach-socfpga/core.h
+++ b/arch/arm/mach-socfpga/core.h
@@@ -31,8 -33,8 +33,6 @@@
  
  #define RSTMGR_MPUMODRST_CPU1         0x2     /* CPU1 Reset */
  
- extern void __iomem *socfpga_scu_base_addr;
 -extern void socfpga_secondary_startup(void);
--
  extern void socfpga_init_clocks(void);
  extern void socfpga_sysmgr_init(void);
  

diff --cc arch/arm/mach-socfpga/headsmp.S
Simple merge

diff --cc arch/arm/mach-socfpga/platsmp.c
Simple merge

diff --cc arch/arm/mach-tegra/reset.h
index 0aee012,29c3dec..9c479c7
--- 1/arch/arm/mach-tegra/reset.h
--- 2/arch/arm/mach-tegra/reset.h
+++ b/arch/arm/mach-tegra/reset.h
@@@ -35,7 -35,9 +35,8 @@@ extern unsigned long __tegra_cpu_reset_
  
  void __tegra_cpu_reset_handler_start(void);
  void __tegra_cpu_reset_handler(void);
+ void __tegra20_cpu1_resettable_status_offset(void);
  void __tegra_cpu_reset_handler_end(void);
 -void tegra_secondary_startup(void);
  
  #ifdef CONFIG_PM_SLEEP
  #define tegra_cpu_lp1_mask \

diff --cc arch/arm/mach-zynq/common.h
index 7038cae,f2f0bf2..79cda2e
--- 1/arch/arm/mach-zynq/common.h
--- 2/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@@ -17,9 -17,10 +17,8 @@@
  #ifndef __MACH_ZYNQ_COMMON_H__
  #define __MACH_ZYNQ_COMMON_H__
  
 -void zynq_secondary_startup(void);
 -
  extern int zynq_slcr_init(void);
  extern int zynq_early_slcr_init(void);
- extern void zynq_slcr_system_reset(void);
  extern void zynq_slcr_cpu_stop(int cpu);
  extern void zynq_slcr_cpu_start(int cpu);
  extern bool zynq_slcr_cpu_state_read(int cpu);

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge

diff --cc drivers/clk/Makefile
index 9df871d,4dcbdd3..5b6af6a
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -72,5 -73,5 +73,6 @@@ obj-$(CONFIG_ARCH_OMAP2PLUS)          += ti
  obj-$(CONFIG_ARCH_U8500)              += ux500/
  obj-$(CONFIG_COMMON_CLK_VERSATILE)    += versatile/
  obj-$(CONFIG_X86)                     += x86/
+ obj-$(CONFIG_ARCH_ZX)                 += zte/
  obj-$(CONFIG_ARCH_ZYNQ)                       += zynq/
 +obj-$(CONFIG_H8300)           += h8300/

diff --cc drivers/clk/imx/clk-imx6sx.c
Simple merge

diff --cc drivers/clocksource/Kconfig
index d1bd53f,618102e..352b6a2
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -276,10 -259,9 +276,15 @@@ config CLKSRC_PX
          This enables OST0 support available on PXA and SA-11x0
          platforms.
  
 +config H8300_TMR16
 +        bool
 +
 +config H8300_TPU
 +        bool
 +
+ config CLKSRC_IMX_GPT
+       bool "Clocksource using i.MX GPT" if COMPILE_TEST
+       depends on ARM && CLKDEV_LOOKUP
+       select CLKSRC_MMIO
+ 
  endmenu

diff --cc drivers/clocksource/Makefile
index 2b34423,fce332c..e268b5e
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -54,7 -51,5 +54,8 @@@ obj-$(CONFIG_ARCH_KEYSTONE)           += timer-k
  obj-$(CONFIG_ARCH_INTEGRATOR_AP)      += timer-integrator-ap.o
  obj-$(CONFIG_CLKSRC_VERSATILE)                += versatile.o
  obj-$(CONFIG_CLKSRC_MIPS_GIC)         += mips-gic-timer.o
+ obj-$(CONFIG_CLKSRC_IMX_GPT)          += timer-imx-gpt.o
  obj-$(CONFIG_ASM9260_TIMER)           += asm9260_timer.o
 +obj-$(CONFIG_H8300)                   += h8300_timer8.o
 +obj-$(CONFIG_H8300_TMR16)             += h8300_timer16.o
 +obj-$(CONFIG_H8300_TPU)                       += h8300_tpu.o