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

Pull ARM SoC platform updates from Olof Johansson:
 "SoC changes, a substantial part of this is cleanup of some of the
  older platforms that used to have a bunch of board files.

  In particular:

   - Remove non-DT i.MX platforms that haven't seen activity in years,
     it's time to remove them.

   - A bunch of cleanup and removal of platform data for TI/OMAP
     platforms, moving over to genpd for power/reset control (yay!)

   - Major cleanup of Samsung S3C24xx and S3C64xx platforms, moving them
     closer to multiplatform support (not quite there yet, but getting
     close).

  There are a few other changes too, smaller fixlets, etc. For new
  platform support, the primary ones are:

   - New SoC: Hisilicon SD5203, ARM926EJ-S platform.

   - Cpufreq support for i.MX7ULP"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (121 commits)
  ARM: mstar: Select MStar intc
  ARM: stm32: Replace HTTP links with HTTPS ones
  ARM: debug: add UART early console support for SD5203
  ARM: hisi: add support for SD5203 SoC
  ARM: omap3: enable off mode automatically
  clk: imx: imx35: Remove mx35_clocks_init()
  clk: imx: imx31: Remove mx31_clocks_init()
  clk: imx: imx27: Remove mx27_clocks_init()
  ARM: imx: Remove unused definitions
  ARM: imx35: Retrieve the IIM base address from devicetree
  ARM: imx3: Retrieve the AVIC base address from devicetree
  ARM: imx3: Retrieve the CCM base address from devicetree
  ARM: imx31: Retrieve the IIM base address from devicetree
  ARM: imx27: Retrieve the CCM base address from devicetree
  ARM: imx27: Retrieve the SYSCTRL base address from devicetree
  ARM: s3c64xx: bring back notes from removed debug-macro.S
  ARM: s3c24xx: fix Wunused-variable warning on !MMU
  ARM: samsung: fix PM debug build with DEBUG_LL but !MMU
  MAINTAINERS: mark linux-samsung-soc list non-moderated
  ARM: imx: Remove remnant board file support pieces
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/include/debug/brcmstb.S
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge

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

diff --cc arch/arm/mach-s3c/common-smdk-s3c24xx.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-anubis.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-at2440evb.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-bast.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-gta02.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-hmt.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-jive.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-mini2440.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-mini6410.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-osiris.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-qt2410.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-real6410.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-rx1950.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-rx3715.c
Simple merge

diff --cc arch/arm/mach-s3c/mach-vstms.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-rcar-gen2.c
Simple merge

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge

diff --cc drivers/mmc/host/Kconfig
index f0cb7aeabbc4eacb98849e49cac12f8857346df4,9f387daa764a62be2994ef4f185a842b9ff0c4ef..31481c9fcc2ecbc274a23969548eded5c94be7b1
--- 1/drivers/mmc/host/Kconfig
--- 2/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -301,8 -289,7 +301,8 @@@ config MMC_SDHCI_TEGR
  
  config MMC_SDHCI_S3C
        tristate "SDHCI support on Samsung S3C SoC"
 -      depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS)
 +      depends on MMC_SDHCI
-       depends on PLAT_SAMSUNG || COMPILE_TEST
++      depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        help
          This selects the Secure Digital Host Controller Interface (SDHCI)
          often referrered to as the HSMMC block in some of the Samsung S3C

diff --cc drivers/mmc/host/s3cmci.c
Simple merge

diff --cc drivers/pwm/Kconfig
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

diff --cc drivers/spi/spi-s3c24xx.c
index 7742170fca9188cd2359375c660afddbab57c7ad,9138a315aa4f836d69b009fcb75c21d75eb75f81..d6f51695ca5b20ec6363501c5922639d187e6189
--- 1/drivers/spi/spi-s3c24xx.c
--- 2/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@@ -19,16 -19,15 +19,15 @@@
  #include <linux/spi/spi.h>
  #include <linux/spi/spi_bitbang.h>
  #include <linux/spi/s3c24xx.h>
+ #include <linux/spi/s3c24xx-fiq.h>
  #include <linux/module.h>
  
- #include <plat/regs-spi.h>
- 
  #include <asm/fiq.h>
  
- #include "spi-s3c24xx-fiq.h"
+ #include "spi-s3c24xx-regs.h"
  
  /**
 - * s3c24xx_spi_devstate - per device data
 + * struct s3c24xx_spi_devstate - per device data
   * @hz: Last frequency calculated for @sppre field.
   * @mode: Last mode setting for the @spcon field.
   * @spcon: Value to write to the SPCON register.

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge