diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-04-21 16:00:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-04-22 11:14:55 +0200 |
| commit | 0cd47616cfbb1422e24414daa5a96637fc5aa663 (patch) | |
| tree | 9a98c733a529011701ae5bae8cd5037f7203072c /arch/arm/Kconfig | |
| parent | c0c237d106bd35a58b65a174bd5ec50901940040 (diff) | |
| parent | 917bf5a312fdb421a65cf3e57914a34e8eccc7a1 (diff) | |
| download | linux-0cd47616cfbb1422e24414daa5a96637fc5aa663.tar.gz | |
Merge branch 'omap1/multiplatform-prep' of git://git.kernel.org/pub/scm/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 <tony@atomide.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index db9b9ed5d7c7..3f987f42afd9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -418,14 +418,12 @@ config ARCH_SA1100 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 select IRQ_DOMAIN - select NEED_MACH_IO_H if PCCARD - select NEED_MACH_MEMORY_H select SPARSE_IRQ help Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx) @@ -586,8 +584,6 @@ source "arch/arm/mach-npcm/Kconfig" source "arch/arm/mach-nspire/Kconfig" -source "arch/arm/plat-omap/Kconfig" - source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-omap2/Kconfig" |