From: Arnd Bergmann Date: Thu, 21 Apr 2022 14:00:23 +0000 (+0200) Subject: Merge branch 'omap1/multiplatform-prep' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0cd47616cfbb1422e24414daa5a96637fc5aa663;p=linux.git Merge branch 'omap1/multiplatform-prep' of git://git./linux/kernel/git/soc/soc into arm/multiplatform 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 Tested-by: Aaro Koskinen Signed-off-by: Arnd Bergmann --- 0cd47616cfbb1422e24414daa5a96637fc5aa663 diff --cc arch/arm/Kconfig index db9b9ed5d7c7d,a65f2c05f01c3..3f987f42afd93 --- a/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 - (), the IPAQ 1940 or the - Samsung SMDK2410 development board (and derivatives). - config ARCH_OMAP1 bool "TI OMAP1" + depends on CPU_LITTLE_ENDIAN - select ARCH_OMAP select CLKSRC_MMIO + select FORCE_PCI if PCCARD select GENERIC_IRQ_CHIP select GPIOLIB select HAVE_LEGACY_CLK diff --cc arch/arm/Makefile index 8740e3a63afb4,7bcf59d0d3154..2c5f9b74fb910 --- a/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)