IXP4xx patches for v6.2:

- Dropped the final static mappings.
 
 - Fixed some errors in the MAINTAINERS file.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEElDRnuGcz/wPCXQWMQRCzN7AZXXMFAmN6sMIACgkQQRCzN7AZ
 XXPW9BAAlsK+1EebeOZksh++jnfFsYChPOexuK1IKkNYUwHmy/eQfwON/QJmwAiu
 u8Hjwo2Ixfg9ZnofJ8kUxXDPtEjVSVkNscCk9jEReFjPlI6c9iAR46fNAa9qaENk
 oKCmOmfZ402qBLpbUK2AsC2Oi8VS5sRVltN0ke2kfjYoXugQd/YjclxLaOLGd6j4
 oie0cP+wLmqczPEsH1FPrd94Y1wrpopvLYN9JztM1UxknSP3RDukkb0www7ygxFT
 5aaYJ6lf6z2WgyiUX82yNNbVi+64F37P5I/Nhbe1lOAMEzvgTfkt1gkLjdP0gZ9g
 N2MNAWPlInudlRveIAqDqLbzDn5deM/SSIp5lrvA47Ht8f8cBlKU7dB1eGZIJ/0c
 fVblJV4F4KC0sMJplhgp5taLCrcDSvxldjZU3zFHbhQNTKx0YhM08L7SzQImoxTx
 gGpCvWdyyCiqYf5dpawCGbk/di1kZEEIhR2CfI3U5EwD66KGDUVAokb3wdUpbkfH
 WSry/MYCDwnLPc1gFLbsRkVEV9IvdFEMe2JWCED+qU3sVyTt4unNTUE+wDPzjml3
 I33/Rsaow3hTOBayzhrCDqmR4WWZbn0c64slnjRMglhw7YkzF+UTYiK7EUNtFSq1
 EDJI35CxlKv1a7gX0EnCRaLPZ09joGFcN7sVpf6+nll4i4uz+1s=
 =DFhx
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmN7YKwACgkQmmx57+YA
 GNmtnQ//ermYN2LyTWRlAQSFx+zbfgd90feC1UGEmYt2/Xp3rLCGZ9B66/AR85uR
 lj0bjMv4Nifd+/dXZGCPjYAxX0xuiWuhiIh6zkQKw387bIDBQWiV9uBodJTNM4dk
 smLuVTUcnQFePXWELs1A2bklnFWwFB3Tm8EA01P9a4WF5Gl8FC4Xshy5DRMLu2kH
 e2slVY2Qbw+ZH6x6BhtCA9b5sIdE+mnO+tBbvn+RGUOxzSdeUmJUpzkkwwHK62yN
 Xb4FLsTHjb7Qq1i5DKHHmo72aGHrlL5+4mNRpV6y1cwFlBGzr659vUABdCGF5O+I
 qv+j2kcLM9pbdl5utHcRQMnVqiDfD0ghi/+WhPrfISuTpCwR66hI7zMJWkWz81lJ
 argmG1fng4GlX0B2KDvXiM8FhmCKKnbu4U/kbR81+hX05PJ9xtET8v+2iFlz1z2z
 9nzzGgHnSYs0Nmi/t/7xdKU9JCVfjxypznEJPXrmPMP7YvynDdOiUoCUYyK6r427
 bltRnt8sY5CQZSYyLkjgqfTmqv94ER66BrCzzc9Omx/LZ75eCb+lRpAT5MQh0oAj
 jKKr/fASPEy4EGe8vUxzZV1bxq0CG1qmtdO93qWF+cmDDre91hCopQNScOpljpP7
 70/iE44zRwj6zTmoKjcgpaFxacOKiqag5gt1KjML1dNOqi0+aVQ=
 =AHLE
 -----END PGP SIGNATURE-----

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>

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>

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