From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Oct 2020 17:33:08 +0000 (-0700)
Subject: Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: v5.10-rc1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e731f3146ff3bba5424b40140e1a7e6f92e94964;p=thirdparty%2Fkernel%2Flinux.git

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
  ...
---

e731f3146ff3bba5424b40140e1a7e6f92e94964
diff --cc drivers/mmc/host/Kconfig
index f0cb7aeabbc4e,9f387daa764a6..31481c9fcc2ec
--- a/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/spi/spi-s3c24xx.c
index 7742170fca918,9138a315aa4f8..d6f51695ca5b2
--- a/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.