Merge branch 'hpe/gxp-soc' into arm/late

Patch series from Nick Hawkins:

"The GXP is the HPE BMC SoC that is used in the majority of HPE current
 generation servers. Traditionally the asic will last multiple
 generations of server before being replaced.

 Info about SoC:

  HPE GXP is the name of the HPE Soc. This SoC is used to implement many
  BMC features at HPE. It supports ARMv7 architecture based on the Cortex
  A9 core. It is capable of using an AXI bus to which a memory controller
  is attached. It has multiple SPI interfaces to connect boot flash and
  BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It has
  multiple i2c engines to drive connectivity with a host infrastructure.
  The initial patches enable the watchdog and timer enabling the host to
  be able to boot."

* hpe/gxp-soc:
  MAINTAINERS: Introduce HPE GXP Architecture
  ARM: dts: Introduce HPE GXP Device tree
  dt-bindings: arm: hpe: add GXP Support
  dt-bindings: timer: hpe,gxp-timer: Add HPE GXP Timer and Watchdog
  clocksource/drivers/timer-gxp: Add HPE GXP Timer
  watchdog: hpe-wdt: Introduce HPE GXP Watchdog
  ARM: configs: multi_v7_defconfig: Add HPE GXP ARCH
  ARM: hpe: Introduce the HPE GXP architecture

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 903165a,13f77ee..340c30e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -550,8 -620,12 +550,10 @@@ source "arch/arm/mach-highbank/Kconfig
  
  source "arch/arm/mach-hisi/Kconfig"
  
+ source "arch/arm/mach-hpe/Kconfig"
+ 
  source "arch/arm/mach-imx/Kconfig"
  
 -source "arch/arm/mach-integrator/Kconfig"
 -
  source "arch/arm/mach-iop32x/Kconfig"
  
  source "arch/arm/mach-ixp4xx/Kconfig"

diff --cc arch/arm/Makefile
index 2c5f9b7,97a8902..c4b0e98
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -179,6 -179,8 +179,7 @@@ machine-$(CONFIG_ARCH_FOOTBRIDGE)  += fo
  machine-$(CONFIG_ARCH_GEMINI)         += gemini
  machine-$(CONFIG_ARCH_HIGHBANK)               += highbank
  machine-$(CONFIG_ARCH_HISI)           += hisi
 -machine-$(CONFIG_ARCH_INTEGRATOR)     += integrator
+ machine-$(CONFIG_ARCH_HPE)            += hpe
  machine-$(CONFIG_ARCH_IOP32X)         += iop32x
  machine-$(CONFIG_ARCH_IXP4XX)         += ixp4xx
  machine-$(CONFIG_ARCH_KEYSTONE)               += keystone

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

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/clocksource/Makefile
index 833cfb7,98017ab..6ca6400
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -85,4 -88,4 +85,5 @@@ obj-$(CONFIG_GX6605S_TIMER)           += timer-g
  obj-$(CONFIG_HYPERV_TIMER)            += hyperv_timer.o
  obj-$(CONFIG_MICROCHIP_PIT64B)                += timer-microchip-pit64b.o
  obj-$(CONFIG_MSC313E_TIMER)           += timer-msc313e.o
 +obj-$(CONFIG_GOLDFISH_TIMER)          += timer-goldfish.o
+ obj-$(CONFIG_GXP_TIMER)                       += timer-gxp.o