| Message ID | 20221121221015.1454948-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c93d8b457461d235ccff6c6864ead6a55ef1c18b |
| Headers | show |
| Series | ARM: ixp4xx: Remove unused debug iomap | expand |
Hello: This patch was applied to soc/soc.git (for-next) by Arnd Bergmann <arnd@arndb.de>: On Mon, 21 Nov 2022 23:10:15 +0100 you wrote: > If we don't provide the .map_io() callback, the LL debug > defines will kick in anyway, so delete the UART debug map > as well. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > ARM SoC folks: please apply this as a fixup on top > of the pulled IXP4xx patches if it looks OK. > > [...] Here is the summary with links: - ARM: ixp4xx: Remove unused debug iomap https://git.kernel.org/soc/soc/c/c93d8b457461 You are awesome, thank you!
diff --git a/arch/arm/mach-ixp4xx/ixp4xx-of.c b/arch/arm/mach-ixp4xx/ixp4xx-of.c index 9f1557f33e84..1b4d84a5b02f 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx-of.c +++ b/arch/arm/mach-ixp4xx/ixp4xx-of.c @@ -2,31 +2,7 @@ /* * IXP4xx Device Tree boot support */ -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/io.h> - #include <asm/mach/arch.h> -#include <asm/mach/map.h> - -#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, - .pfn = __phys_to_pfn(CONFIG_DEBUG_UART_PHYS), - .length = SZ_4K, - .type = MT_DEVICE, - }, -}; - -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 @@ -42,6 +18,5 @@ static const char *ixp4xx_of_board_compat[] = { }; DT_MACHINE_START(IXP4XX_DT, "IXP4xx (Device Tree)") - .map_io = ixp4xx_of_map_io, .dt_compat = ixp4xx_of_board_compat, MACHINE_END
If we don't provide the .map_io() callback, the LL debug defines will kick in anyway, so delete the UART debug map as well. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- ARM SoC folks: please apply this as a fixup on top of the pulled IXP4xx patches if it looks OK. --- arch/arm/mach-ixp4xx/ixp4xx-of.c | 25 ------------------------- 1 file changed, 25 deletions(-)