Merge tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi into next/soc

Merge "pull request for hisilicon hip04 soc and D01 board updates" from Wei Xu:

ARM: mach-hisi: Hisilicon hip04 soc and D01 board updates for 3.18

- Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4
- Enable MCPM on HiP04 SoC
- Enable 16 cores on HiP04 SoC
- Add platform & Fabric controller devicetree binding document for HiP04 SoC
- Add hip04.dtsi & hip04-d01.dts for hip04 SoC platform and D01 board
- Enable HiP04 SoC in both hi3xxx_defconfig & multi_v7_defconfig
- Add the support of Hisilicon HiP04 debug uart

* tag 'D01-for-3.18' of git://github.com/hisilicon/linux-hisi:
  ARM: debug: add HiP04 debug uart
  ARM: config: enable hisilicon hip04
  ARM: dts: add hip04 dts
  document: dt: add the binding on HiP04
  ARM: hisi: enable HiP04
  ARM: hisi: enable MCPM implementation
  ARM: mcpm: support 4 clusters

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/Kconfig
index 27a5c5b3f4090cfe835f9441754077158a69d2d8,e43221ab4048135ac3046d1e821d6539845a0a5c..cf6da5226cefe85d66d554987371a38f82dda97c
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -387,7 -387,6 +387,7 @@@ config ARCH_CLPS711
        select CPU_ARM720T
        select GENERIC_CLOCKEVENTS
        select MFD_SYSCON
 +      select SOC_BUS
        help
          Support for Cirrus Logic 711x/721x/731x based boards.
  
@@@ -1406,6 -1405,15 +1406,15 @@@ config MCP
          for (multi-)cluster based systems, such as big.LITTLE based
          systems.
  
+ config MCPM_QUAD_CLUSTER
+       bool
+       depends on MCPM
+       help
+         To avoid wasting resources unnecessarily, MCPM only supports up
+         to 2 clusters by default.
+         Platforms with 3 or 4 clusters that use MCPM must select this
+         option to allow the additional clusters to be managed.
+ 
  config BIG_LITTLE
        bool "big.LITTLE support (Experimental)"
        depends on CPU_V7 && SMP
@@@ -1984,6 -1992,8 +1993,6 @@@ config XIP_PHYS_ADD
  config KEXEC
        bool "Kexec system call (EXPERIMENTAL)"
        depends on (!SMP || PM_SLEEP_SMP)
 -      select CRYPTO
 -      select CRYPTO_SHA256
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot

diff --combined arch/arm/boot/dts/Makefile
index 2bff594ca7e2f3b4b66cf04decad4cc0f15a0db6,abf5308803182879a9b8c47809478a1132e12510..22aba8598ca76d7d8786a218c38cc1f435b53ece
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -90,6 -90,7 +90,7 @@@ dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4
  dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb
+ dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
@@@ -361,6 -362,7 +362,6 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
 -      r8a7740-armadillo800eva-reference.dtb \
        r8a7779-marzen.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
@@@ -371,7 -373,6 +372,7 @@@
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
 +      r8a7740-armadillo800eva.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \