Merge branch 'axxia/soc' into next/soc

Patches from Anders Berg applied individually:

Here is version 4 of platform support for AXM5516 SoC.

The clk driver is now applied to clk-next. The rest should be ready for
arm-soc. Haven't got any response from the power/reset maintainers... I hope
this driver can be taken via arm-soc as well.

The AXM55xx family consists of devices that may contain up to 16 ARM Cortex-A15
cores (in a 4x4 cluster configuration). The cores within each cluster share an
L2 cache, and the clusters are connected to each other via a CCN-504 cache
coherent interconnect.

This machine requires CONFIG_ARM_LPAE enabled as all peripherals are located
above 4GB in the memory map.

* axxia/soc:
  ARM: dts: axxia: Add reset controller
  power: reset: Add Axxia system reset driver
  ARM: axxia: Adding defconfig for AXM55xx
  ARM: dts: Device tree for AXM55xx.
  ARM: Add platform support for LSI AXM55xx SoC

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

diff --combined arch/arm/Kconfig
index 1c1fbbf6e4ae04c823200355b6c1a1ec04ed4079,1f8651a3a16e891a3b184eaa08916e40b9d2b210..f849690eb8887f26484d2d76a21acd9c593f6cb9
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -30,9 -30,9 +30,9 @@@ config AR
        select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
        select HAVE_ARCH_TRACEHOOK
        select HAVE_BPF_JIT
 +      select HAVE_CC_STACKPROTECTOR
        select HAVE_CONTEXT_TRACKING
        select HAVE_C_RECORDMCOUNT
 -      select HAVE_CC_STACKPROTECTOR
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
@@@ -311,7 -311,6 +311,7 @@@ config ARCH_MULTIPLATFOR
        select ARM_HAS_SG_CHAIN
        select ARM_PATCH_PHYS_VIRT
        select AUTO_ZRELADDR
 +      select CLKSRC_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select MULTI_IRQ_HANDLER
@@@ -376,6 -375,7 +376,6 @@@ config ARCH_AT9
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select IRQ_DOMAIN
 -      select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H if PCCARD
        select PINCTRL
        select PINCTRL_AT91 if USE_OF
@@@ -422,8 -422,8 +422,8 @@@ config ARCH_EFM3
        bool "Energy Micro efm32"
        depends on !MMU
        select ARCH_REQUIRE_GPIOLIB
 -      select AUTO_ZRELADDR
        select ARM_NVIC
 +      select AUTO_ZRELADDR
        select CLKSRC_OF
        select COMMON_CLK
        select CPU_V7M
@@@ -511,8 -511,8 +511,8 @@@ config ARCH_IXP4X
        bool "IXP4xx-based"
        depends on MMU
        select ARCH_HAS_DMA_SET_COHERENT_MASK
 -      select ARCH_SUPPORTS_BIG_ENDIAN
        select ARCH_REQUIRE_GPIOLIB
 +      select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
        select CPU_XSCALE
        select DMABOUNCE if PCI
@@@ -950,6 -950,8 +950,8 @@@ source "arch/arm/mach-mvebu/Kconfig
  
  source "arch/arm/mach-at91/Kconfig"
  
+ source "arch/arm/mach-axxia/Kconfig"
+ 
  source "arch/arm/mach-bcm/Kconfig"
  
  source "arch/arm/mach-berlin/Kconfig"
@@@ -1110,9 -1112,9 +1112,9 @@@ config ARM_NR_BANK
        default 8
  
  config IWMMXT
 -      bool "Enable iWMMXt support" if !CPU_PJ4
 -      depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
 -      default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4
 +      bool "Enable iWMMXt support"
 +      depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4 || CPU_PJ4B
 +      default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4 || CPU_PJ4B
        help
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.
@@@ -1575,8 -1577,8 +1577,8 @@@ config BIG_LITTL
  config BL_SWITCHER
        bool "big.LITTLE switcher support"
        depends on BIG_LITTLE && MCPM && HOTPLUG_CPU
 -      select CPU_PM
        select ARM_CPU_SUSPEND
 +      select CPU_PM
        help
          The big.LITTLE "switcher" provides the core functionality to
          transparently handle transition between a cluster of A15's
@@@ -1920,9 -1922,9 +1922,9 @@@ config XE
        depends on CPU_V7 && !CPU_V6
        depends on !GENERIC_ATOMIC64
        depends on MMU
 +      select ARCH_DMA_ADDR_T_64BIT
        select ARM_PSCI
        select SWIOTLB_XEN
 -      select ARCH_DMA_ADDR_T_64BIT
        help
          Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
  

diff --combined arch/arm/boot/dts/Makefile
index a62dddc60614bf9d0d689b441c0a18d5de955777,f73797f7ff4864c1c4e8913cff7a1ac1f482877f..7ec6ec076417523c1977cd6ebc9e2004e68f9949
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -50,10 -50,12 +50,11 @@@ dtb-$(CONFIG_ARCH_AT91)    += sama5d35ek.d
  dtb-$(CONFIG_ARCH_AT91)       += sama5d36ek.dtb
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
+ dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
        bcm21664-garnet.dtb
 -dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 -dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb        \
        berlin2cd-google-chromecast.dtb
@@@ -245,7 -247,6 +246,7 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-sbc-t3730.dtb \
        omap3-devkit8000.dtb \
        omap3-beagle-xm.dtb \
 +      omap3-beagle-xm-ab.dtb \
        omap3-evm.dtb \
        omap3-evm-37xx.dtb \
        omap3-ldp.dtb \
@@@ -289,18 -290,23 +290,18 @@@
        am43x-epos-evm.dtb \
        am437x-gp-evm.dtb \
        dra7-evm.dtb
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 +dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
 +      orion5x-lacie-ethernet-disk-mini-v2.dtb \
 +      orion5x-maxtor-shared-storage-2.dtb \
 +      orion5x-rd88f5182-nas.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-apq8074-dragonboard.dtb
 -dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 -      ste-hrefprev60-stuib.dtb \
 -      ste-hrefprev60-tvk.dtb \
 -      ste-hrefv60plus-stuib.dtb \
 -      ste-hrefv60plus-tvk.dtb \
 -      ste-ccu8540.dtb \
 -      ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
 -      r7s72100-genmai.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
        r7s72100-genmai-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
@@@ -364,16 -370,9 +365,16 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
        tegra30-cardhu-a04.dtb \
        tegra114-dalmore.dtb \
        tegra124-venice2.dtb
 +dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 +dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 +      ste-hrefprev60-stuib.dtb \
 +      ste-hrefprev60-tvk.dtb \
 +      ste-hrefv60plus-stuib.dtb \
 +      ste-hrefv60plus-tvk.dtb \
 +      ste-ccu8540.dtb \
 +      ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \