Unverified Commit b8d0b1be authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ixp4xx-for-v6.2' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 566fb671 dc6e328a

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -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



+4
−21






























Original line number
Diff line number
Diff line







@@ -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