Merge branch 'hisi/soc' into next/soc

* hisi/soc:
  ARM: dts: rename hi4511 dts file
  ARM: hisi: remove init_time
  ARM: hisi: rename hi3xxx to hisi
  ARM: dts: enable clock binding on Hi3620
  ARM: hi3xxx: add hotplug support
  ARM: hi3xxx: add smp support
  ARM: config: add defconfig for Hi3xxx
  ARM: config: enable hi3xxx in multi_v7_defconfig
  ARM: dts: enable hi4511 with device tree
  ARM: hi3xxx: add board support with device tree

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --combined arch/arm/Kconfig
index 5f7f8d59124a92650850f09875d3221e59470de6,b7662dfcd847cc3d055815d86feb6becf2e948dc..d08045df8213cafa9310c34ba1e2308b9a08bdc4
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -410,26 -410,6 +410,26 @@@ config ARCH_EBSA11
          Ethernet interface, two PCMCIA sockets, two serial ports and a
          parallel port.
  
 +config ARCH_EFM32
 +      bool "Energy Micro efm32"
 +      depends on !MMU
 +      select ARCH_REQUIRE_GPIOLIB
 +      select ARM_NVIC
 +      # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,
 +      # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO
 +      select CLKSRC_MMIO
 +      select CLKSRC_OF
 +      select COMMON_CLK
 +      select CPU_V7M
 +      select GENERIC_CLOCKEVENTS
 +      select NO_DMA
 +      select NO_IOPORT
 +      select SPARSE_IRQ
 +      select USE_OF
 +      help
 +        Support for Energy Micro's (now Silicon Labs) efm32 Giant Gecko
 +        processors.
 +
  config ARCH_EP93XX
        bool "EP93xx-based"
        select ARCH_HAS_HOLES_MEMORYMODEL
@@@ -664,9 -644,8 +664,9 @@@ config ARCH_MS
          stack and controls some vital subsystems
          (clock and power control, etc).
  
 -config ARCH_SHMOBILE
 -      bool "Renesas SH-Mobile / R-Mobile"
 +config ARCH_SHMOBILE_LEGACY
 +      bool "Renesas SH-Mobile / R-Mobile (non-multiplatform)"
 +      select ARCH_SHMOBILE
        select ARM_PATCH_PHYS_VIRT
        select CLKDEV_LOOKUP
        select GENERIC_CLOCKEVENTS
@@@ -681,8 -660,7 +681,8 @@@
        select PM_GENERIC_DOMAINS if PM
        select SPARSE_IRQ
        help
 -        Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
 +        Support for Renesas's SH-Mobile and R-Mobile ARM platforms using
 +        a non-multiplatform kernel.
  
  config ARCH_RPC
        bool "RiscPC"
@@@ -749,7 -727,7 +749,7 @@@ config ARCH_S3C64X
        select CLKDEV_LOOKUP
        select CLKSRC_SAMSUNG_PWM
        select COMMON_CLK
 -      select CPU_V6
 +      select CPU_V6K
        select GENERIC_CLOCKEVENTS
        select GPIO_SAMSUNG
        select HAVE_S3C2410_I2C if I2C
@@@ -933,8 -911,6 +933,8 @@@ source "arch/arm/mach-bcm/Kconfig
  
  source "arch/arm/mach-bcm2835/Kconfig"
  
 +source "arch/arm/mach-berlin/Kconfig"
 +
  source "arch/arm/mach-clps711x/Kconfig"
  
  source "arch/arm/mach-cns3xxx/Kconfig"
@@@ -951,6 -927,8 +951,8 @@@ source "arch/arm/mach-gemini/Kconfig
  
  source "arch/arm/mach-highbank/Kconfig"
  
+ source "arch/arm/mach-hisi/Kconfig"
+ 
  source "arch/arm/mach-integrator/Kconfig"
  
  source "arch/arm/mach-iop32x/Kconfig"
@@@ -969,8 -947,6 +971,8 @@@ source "arch/arm/mach-ks8695/Kconfig
  
  source "arch/arm/mach-msm/Kconfig"
  
 +source "arch/arm/mach-moxart/Kconfig"
 +
  source "arch/arm/mach-mv78xx0/Kconfig"
  
  source "arch/arm/mach-imx/Kconfig"
@@@ -1637,7 -1613,7 +1639,7 @@@ config HZ_FIXE
        default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
                ARCH_S5PV210 || ARCH_EXYNOS4
        default AT91_TIMER_HZ if ARCH_AT91
 -      default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
 +      default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE_LEGACY
        default 0
  
  choice
@@@ -1822,10 -1798,10 +1824,10 @@@ config ARCH_WANT_GENERAL_HUGETL
  source "mm/Kconfig"
  
  config FORCE_MAX_ZONEORDER
 -      int "Maximum zone order" if ARCH_SHMOBILE
 -      range 11 64 if ARCH_SHMOBILE
 +      int "Maximum zone order" if ARCH_SHMOBILE_LEGACY
 +      range 11 64 if ARCH_SHMOBILE_LEGACY
        default "12" if SOC_AM33XX
 -      default "9" if SA1111
 +      default "9" if SA1111 || ARCH_EFM32
        default "11"
        help
          The kernel memory allocator divides physically contiguous memory

diff --combined arch/arm/Makefile
index 91b16ce35a6c0b139873661f124c53fb0ef8f5bf,173ea7b01ff874d8c670a1ca9aec1ebdab812119..e47c09bd23bd1ea74dd547526ba3ca28fd26c229
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -148,17 -148,16 +148,18 @@@ textofs-$(CONFIG_ARCH_MSM8960) := 0x002
  machine-$(CONFIG_ARCH_AT91)           += at91
  machine-$(CONFIG_ARCH_BCM)            += bcm
  machine-$(CONFIG_ARCH_BCM2835)                += bcm2835
 +machine-$(CONFIG_ARCH_BERLIN)         += berlin
  machine-$(CONFIG_ARCH_CLPS711X)               += clps711x
  machine-$(CONFIG_ARCH_CNS3XXX)                += cns3xxx
  machine-$(CONFIG_ARCH_DAVINCI)                += davinci
  machine-$(CONFIG_ARCH_DOVE)           += dove
  machine-$(CONFIG_ARCH_EBSA110)                += ebsa110
 +machine-$(CONFIG_ARCH_EFM32)          += efm32
  machine-$(CONFIG_ARCH_EP93XX)         += ep93xx
  machine-$(CONFIG_ARCH_EXYNOS)         += exynos
  machine-$(CONFIG_ARCH_GEMINI)         += gemini
  machine-$(CONFIG_ARCH_HIGHBANK)               += highbank
+ machine-$(CONFIG_ARCH_HI3xxx)         += hisi
  machine-$(CONFIG_ARCH_INTEGRATOR)     += integrator
  machine-$(CONFIG_ARCH_IOP13XX)                += iop13xx
  machine-$(CONFIG_ARCH_IOP32X)         += iop32x
@@@ -169,7 -168,6 +170,7 @@@ machine-$(CONFIG_ARCH_KIRKWOOD)            += kir
  machine-$(CONFIG_ARCH_KS8695)         += ks8695
  machine-$(CONFIG_ARCH_LPC32XX)                += lpc32xx
  machine-$(CONFIG_ARCH_MMP)            += mmp
 +machine-$(CONFIG_ARCH_MOXART)         += moxart
  machine-$(CONFIG_ARCH_MSM)            += msm
  machine-$(CONFIG_ARCH_MV78XX0)                += mv78xx0
  machine-$(CONFIG_ARCH_MVEBU)          += mvebu
@@@ -193,6 -191,7 +194,6 @@@ machine-$(CONFIG_ARCH_S5PC100)             += s5pc
  machine-$(CONFIG_ARCH_S5PV210)                += s5pv210
  machine-$(CONFIG_ARCH_SA1100)         += sa1100
  machine-$(CONFIG_ARCH_SHMOBILE)       += shmobile
 -machine-$(CONFIG_ARCH_SHMOBILE_MULTI)         += shmobile
  machine-$(CONFIG_ARCH_SIRF)           += prima2
  machine-$(CONFIG_ARCH_SOCFPGA)                += socfpga
  machine-$(CONFIG_ARCH_STI)            += sti

diff --combined arch/arm/boot/dts/Makefile
index b44dd26b951d1f910a8d9592a0242d4a5ab31cdd,d0b92dbe204908d85c3829a7234ba2e84182d3fa..e8daf7061f8322de784d4d4e3d11065203da1497
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -45,9 -45,6 +45,9 @@@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-r
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
        bcm28155-ap.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 +dtb-$(CONFIG_ARCH_BERLIN) += \
 +      berlin2-sony-nsz-gs7.dtb        \
 +      berlin2cd-google-chromecast.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
  dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
@@@ -55,7 -52,6 +55,7 @@@
        dove-d2plug.dtb \
        dove-d3plug.dtb \
        dove-dove-db.dtb
 +dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
@@@ -70,6 -66,7 +70,7 @@@
        exynos5420-smdk5420.dtb \
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb
+ dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
@@@ -220,7 -217,7 +221,7 @@@ dtb-$(CONFIG_ARCH_U8500) += ste-snowbal
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \

diff --combined arch/arm/configs/multi_v7_defconfig
index 7e3f5cba7cfdc36a3743484cc32aaa5f2ebf1185,7910d2206634c63f62fd57bc08719ce796482c00..0ae6dc35209fc103e3d8983b6e1b279ea7064e39
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -7,11 -7,9 +7,12 @@@ CONFIG_MACH_ARMADA_370=
  CONFIG_MACH_ARMADA_XP=y
  CONFIG_ARCH_BCM=y
  CONFIG_ARCH_BCM_MOBILE=y
 +CONFIG_ARCH_BERLIN=y
 +CONFIG_MACH_BERLIN_BG2=y
 +CONFIG_MACH_BERLIN_BG2CD=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_ARCH_HIGHBANK=y
+ CONFIG_ARCH_HI3xxx=y
  CONFIG_ARCH_KEYSTONE=y
  CONFIG_ARCH_MXC=y
  CONFIG_MACH_IMX51_DT=y
@@@ -72,7 -70,6 +73,7 @@@ CONFIG_KS8851=
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=y
  CONFIG_MDIO_SUN4I=y
 +CONFIG_TI_CPSW=y
  CONFIG_KEYBOARD_SPEAR=y
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_SERIAL_8250=y
@@@ -137,14 -134,12 +138,14 @@@ CONFIG_USB_GPIO_VBUS=
  CONFIG_USB_ISP1301=y
  CONFIG_USB_MXS_PHY=y
  CONFIG_MMC=y
 +CONFIG_MMC_BLOCK_MINORS=16
  CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_ESDHC_IMX=y
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SDHCI_SPEAR=y
 +CONFIG_MMC_SDHCI_BCM_KONA=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_EDAC=y