From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 20 Nov 2022 22:47:06 +0000 (+0100)
Subject: ARM: ixp4xx: Remove unused static map
X-Git-Tag: v6.2-rc1~206^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6e328a8d28e1c0c6e4f19e90cca17bb8fc126b;p=thirdparty%2Flinux.git

ARM: ixp4xx: Remove unused static map

The IXP4xx is just using the device tree now, only keep the
static UART map if and only if we are debugging.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/mach-ixp4xx/ixp4xx-of.c b/arch/arm/mach-ixp4xx/ixp4xx-of.c
index f543e2adae0cd..9f1557f33e84b 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