diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 14:27:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 14:27:40 +0300 |
| commit | b8d0b1bef204037567b5eefae3270747577c3554 (patch) | |
| tree | a6d98d14533ce17975f7d67ef90f5e4b71d78fbc | |
| parent | 566fb6711f186803c9b078f35fc1eb9169541ef0 (diff) | |
| parent | dc6e328a8d28e1c0c6e4f19e90cca17bb8fc126b (diff) | |
| download | linux-b8d0b1bef204037567b5eefae3270747577c3554.tar.xz | |
Merge tag 'ixp4xx-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into arm/soc
IXP4xx patches for v6.2:
- Dropped the final static mappings.
- Fixed some errors in the MAINTAINERS file.
* tag 'ixp4xx-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: ixp4xx: Remove unused static map
MAINTAINERS: adjust ARM/INTEL IXP4XX ARM ARCHITECTURE to ixp4xx clean-up
Link: https://lore.kernel.org/r/CACRpkdYNwyZ1FDM07MkUfYyYGtXFQfy1xP9Utc5+K2+gn_ZW9g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx-of.c | 25 |
2 files changed, 4 insertions, 23 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e04d944005ba..e4556ee0408c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2272,8 +2272,6 @@ F: drivers/clocksource/timer-ixp4xx.c F: drivers/crypto/ixp4xx_crypto.c F: drivers/gpio/gpio-ixp4xx.c F: drivers/irqchip/irq-ixp4xx.c -F: include/linux/irqchip/irq-ixp4xx.h -F: include/linux/platform_data/timer-ixp4xx.h ARM/INTEL KEEMBAY ARCHITECTURE M: Paul J. Murphy <paul.j.murphy@intel.com> diff --git a/arch/arm/mach-ixp4xx/ixp4xx-of.c b/arch/arm/mach-ixp4xx/ixp4xx-of.c index f543e2adae0c..9f1557f33e84 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx-of.c +++ b/arch/arm/mach-ixp4xx/ixp4xx-of.c @@ -9,27 +9,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -/* - * These are the only fixed phys to virt mappings we ever need - * we put it right after the UART mapping at 0xffc80000-0xffc81fff - */ -#define IXP4XX_EXP_CFG_BASE_PHYS 0xC4000000 -#define IXP4XX_EXP_CFG_BASE_VIRT 0xFEC14000 - -static struct map_desc ixp4xx_of_io_desc[] __initdata = { - /* - * This is needed for runtime system configuration checks, - * such as reading if hardware so-and-so is present. This - * could eventually be converted into a syscon once all boards - * are converted to device tree. - */ - { - .virtual = IXP4XX_EXP_CFG_BASE_VIRT, - .pfn = __phys_to_pfn(IXP4XX_EXP_CFG_BASE_PHYS), - .length = SZ_4K, - .type = MT_DEVICE, - }, #ifdef CONFIG_DEBUG_UART_8250 +static struct map_desc ixp4xx_of_io_desc[] __initdata = { /* This is needed for LL-debug/earlyprintk/debug-macro.S */ { .virtual = CONFIG_DEBUG_UART_VIRT, @@ -37,13 +18,15 @@ static struct map_desc ixp4xx_of_io_desc[] __initdata = { .length = SZ_4K, .type = MT_DEVICE, }, -#endif }; static void __init ixp4xx_of_map_io(void) { iotable_init(ixp4xx_of_io_desc, ARRAY_SIZE(ixp4xx_of_io_desc)); } +#else +#define ixp4xx_of_map_io NULL +#endif /* * We handle 4 different SoC families. These compatible strings are enough |