Merge branch 'omap1/multiplatform-prep' of git://git.kernel.org/pub/scm/linux/kernel...

This is the full series for converting OMAP1 to multiplatform, rebased
from my 2019 attempt to do the same thing. The soc tree contains simpler
patches to do the same for iop32x, ixp4xx, ep93xx and s3c24xx, which
means we are getting closer to completing this for all ARMv5 platforms
(I have patches for PXA, which is the last one remaining).

Janusz already tested the branch separately and did the missing work
for the common-clk conversion after my previous approach was broken.

Aaro found one regression during additional testing, this is fixed now.

Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index db9b9ed5d7c7dc0fa733d84129ab9c7125acca06,a65f2c05f01c3e443739b9e38485c425c0ccd985..3f987f42afd93f46d2d860674aae2cedf89dd917
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -415,11 -466,27 +415,11 @@@ config ARCH_SA110
        help
          Support for StrongARM 11x0 based boards.
  
 -config ARCH_S3C24XX
 -      bool "Samsung S3C24XX SoCs"
 -      select ATAGS
 -      select CLKSRC_SAMSUNG_PWM
 -      select GPIO_SAMSUNG
 -      select GPIOLIB
 -      select NEED_MACH_IO_H
 -      select S3C2410_WATCHDOG
 -      select SAMSUNG_ATAGS
 -      select USE_OF
 -      select WATCHDOG
 -      help
 -        Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
 -        and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
 -        (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
 -        Samsung SMDK2410 development board (and derivatives).
 -
  config ARCH_OMAP1
        bool "TI OMAP1"
-       select ARCH_OMAP
 +      depends on CPU_LITTLE_ENDIAN
        select CLKSRC_MMIO
+       select FORCE_PCI if PCCARD
        select GENERIC_IRQ_CHIP
        select GPIOLIB
        select HAVE_LEGACY_CLK

diff --cc arch/arm/Makefile
index 8740e3a63afb4e45bf7af126438b34567378d3b9,7bcf59d0d315472c56f8cdcf55e8cb8a0a787c2f..2c5f9b74fb9104a6d1814209bdd5310825f3dc3b
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -224,9 -228,9 +224,8 @@@ machine-$(CONFIG_PLAT_SPEAR)               += spea
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
- plat-$(CONFIG_ARCH_OMAP)      += omap
  plat-$(CONFIG_PLAT_ORION)     += orion
  plat-$(CONFIG_PLAT_PXA)               += pxa
 -plat-$(CONFIG_PLAT_VERSATILE) += versatile
  
  # The byte offset of the kernel image in RAM from the start of RAM.
  TEXT_OFFSET := $(textofs-y)