From: Arnd Bergmann Date: Tue, 10 Sep 2019 20:22:03 +0000 (+0200) Subject: ARM: pxa: make addr-map.h header local X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=225b5d376e53543a66fc9b824a05cfcdf74c763a;p=linux.git ARM: pxa: make addr-map.h header local Drivers should not rely on the contents of this file, so move it into the platform directory directly. Cc: Philipp Zabel Cc: Paul Parsons Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/lkml/87mudkmx8g.fsf@belgarion.home/ --- diff --git a/arch/arm/mach-pxa/addr-map.h b/arch/arm/mach-pxa/addr-map.h new file mode 100644 index 0000000000000..93cfe7dbfec69 --- /dev/null +++ b/arch/arm/mach-pxa/addr-map.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MACH_ADDR_MAP_H +#define __ASM_MACH_ADDR_MAP_H + +/* + * Chip Selects + */ +#define PXA_CS0_PHYS 0x00000000 +#define PXA_CS1_PHYS 0x04000000 +#define PXA_CS2_PHYS 0x08000000 +#define PXA_CS3_PHYS 0x0C000000 +#define PXA_CS4_PHYS 0x10000000 +#define PXA_CS5_PHYS 0x14000000 + +#define PXA300_CS0_PHYS 0x00000000 /* PXA300/PXA310 _only_ */ +#define PXA300_CS1_PHYS 0x30000000 /* PXA300/PXA310 _only_ */ +#define PXA3xx_CS2_PHYS 0x10000000 +#define PXA3xx_CS3_PHYS 0x14000000 + +/* + * Peripheral Bus + */ +#define PERIPH_PHYS 0x40000000 +#define PERIPH_VIRT IOMEM(0xf2000000) +#define PERIPH_SIZE 0x02000000 + +/* + * Static Memory Controller (w/ SDRAM controls on PXA25x/PXA27x) + */ +#define PXA2XX_SMEMC_PHYS 0x48000000 +#define PXA3XX_SMEMC_PHYS 0x4a000000 +#define SMEMC_VIRT IOMEM(0xf6000000) +#define SMEMC_SIZE 0x00100000 + +/* + * Dynamic Memory Controller (only on PXA3xx) + */ +#define DMEMC_PHYS 0x48100000 +#define DMEMC_VIRT IOMEM(0xf6100000) +#define DMEMC_SIZE 0x00100000 + +/* + * Reserved space for low level debug virtual addresses within + * 0xf6200000..0xf6201000 + */ + +/* + * DFI Bus for NAND, PXA3xx only + */ +#define NAND_PHYS 0x43100000 +#define NAND_VIRT IOMEM(0xf6300000) +#define NAND_SIZE 0x00100000 + +/* + * Internal Memory Controller (PXA27x and later) + */ +#define IMEMC_PHYS 0x58000000 +#define IMEMC_VIRT IOMEM(0xfe000000) +#define IMEMC_SIZE 0x00100000 + +#endif /* __ASM_MACH_ADDR_MAP_H */ diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 3c3cd90bb9b4b..f9083c4f0aea1 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -22,7 +22,7 @@ #include #include -#include +#include "addr-map.h" #include #include #include diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 191a6c24fe19d..140a44cb29891 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c @@ -40,7 +40,7 @@ #include #include "pxa27x.h" -#include +#include "addr-map.h" #include #include diff --git a/arch/arm/mach-pxa/include/mach/addr-map.h b/arch/arm/mach-pxa/include/mach/addr-map.h deleted file mode 100644 index 93cfe7dbfec69..0000000000000 --- a/arch/arm/mach-pxa/include/mach/addr-map.h +++ /dev/null @@ -1,61 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_MACH_ADDR_MAP_H -#define __ASM_MACH_ADDR_MAP_H - -/* - * Chip Selects - */ -#define PXA_CS0_PHYS 0x00000000 -#define PXA_CS1_PHYS 0x04000000 -#define PXA_CS2_PHYS 0x08000000 -#define PXA_CS3_PHYS 0x0C000000 -#define PXA_CS4_PHYS 0x10000000 -#define PXA_CS5_PHYS 0x14000000 - -#define PXA300_CS0_PHYS 0x00000000 /* PXA300/PXA310 _only_ */ -#define PXA300_CS1_PHYS 0x30000000 /* PXA300/PXA310 _only_ */ -#define PXA3xx_CS2_PHYS 0x10000000 -#define PXA3xx_CS3_PHYS 0x14000000 - -/* - * Peripheral Bus - */ -#define PERIPH_PHYS 0x40000000 -#define PERIPH_VIRT IOMEM(0xf2000000) -#define PERIPH_SIZE 0x02000000 - -/* - * Static Memory Controller (w/ SDRAM controls on PXA25x/PXA27x) - */ -#define PXA2XX_SMEMC_PHYS 0x48000000 -#define PXA3XX_SMEMC_PHYS 0x4a000000 -#define SMEMC_VIRT IOMEM(0xf6000000) -#define SMEMC_SIZE 0x00100000 - -/* - * Dynamic Memory Controller (only on PXA3xx) - */ -#define DMEMC_PHYS 0x48100000 -#define DMEMC_VIRT IOMEM(0xf6100000) -#define DMEMC_SIZE 0x00100000 - -/* - * Reserved space for low level debug virtual addresses within - * 0xf6200000..0xf6201000 - */ - -/* - * DFI Bus for NAND, PXA3xx only - */ -#define NAND_PHYS 0x43100000 -#define NAND_VIRT IOMEM(0xf6300000) -#define NAND_SIZE 0x00100000 - -/* - * Internal Memory Controller (PXA27x and later) - */ -#define IMEMC_PHYS 0x58000000 -#define IMEMC_VIRT IOMEM(0xfe000000) -#define IMEMC_SIZE 0x00100000 - -#endif /* __ASM_MACH_ADDR_MAP_H */ diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index 7f10b86f85fd7..e03436710752f 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c @@ -38,7 +38,7 @@ #include "pxa27x.h" #include "lpd270.h" -#include +#include "addr-map.h" #include #include #include diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 345a44d15a2c1..20ca3e28c7fbb 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -34,7 +34,7 @@ #include #include "pxa27x.h" -#include +#include "addr-map.h" #include #include #include diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index c8200fc2159d5..f0072e63b4564 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c @@ -51,7 +51,7 @@ #include #include #include -#include +#include "addr-map.h" #include #include "generic.h" diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index dfc90b41fba31..8d21c7eef1d29 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -34,7 +34,7 @@ #include "pxa25x.h" #include #include "pm.h" -#include +#include "addr-map.h" #include #include "generic.h" diff --git a/arch/arm/mach-pxa/pxa25x.h b/arch/arm/mach-pxa/pxa25x.h index 403bc16c2ed21..4699ebf7b486f 100644 --- a/arch/arm/mach-pxa/pxa25x.h +++ b/arch/arm/mach-pxa/pxa25x.h @@ -2,7 +2,7 @@ #ifndef __MACH_PXA25x_H #define __MACH_PXA25x_H -#include +#include "addr-map.h" #include #include "mfp-pxa25x.h" #include diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 38fdd22c4dc5c..c36a9784fab8b 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -33,7 +33,7 @@ #include #include #include "pm.h" -#include +#include "addr-map.h" #include #include "generic.h" diff --git a/arch/arm/mach-pxa/pxa27x.h b/arch/arm/mach-pxa/pxa27x.h index 6c99090647d29..bf2755561fe5b 100644 --- a/arch/arm/mach-pxa/pxa27x.h +++ b/arch/arm/mach-pxa/pxa27x.h @@ -3,7 +3,7 @@ #define __MACH_PXA27x_H #include -#include +#include "addr-map.h" #include #include "mfp-pxa27x.h" #include diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index 7c569fa2a6da1..7881888107c7e 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c @@ -32,7 +32,7 @@ #include #include #include "pm.h" -#include +#include "addr-map.h" #include #include diff --git a/arch/arm/mach-pxa/pxa3xx.h b/arch/arm/mach-pxa/pxa3xx.h index 22ace053ea25a..6b424d3286802 100644 --- a/arch/arm/mach-pxa/pxa3xx.h +++ b/arch/arm/mach-pxa/pxa3xx.h @@ -2,7 +2,7 @@ #ifndef __MACH_PXA3XX_H #define __MACH_PXA3XX_H -#include +#include "addr-map.h" #include #include diff --git a/arch/arm/mach-pxa/trizeps4.h b/arch/arm/mach-pxa/trizeps4.h index 7597b9de11e24..e0f37c0ff06f7 100644 --- a/arch/arm/mach-pxa/trizeps4.h +++ b/arch/arm/mach-pxa/trizeps4.h @@ -11,7 +11,7 @@ #ifndef _TRIPEPS4_H_ #define _TRIPEPS4_H_ -#include +#include "addr-map.h" #include /* PXA_GPIO_TO_IRQ */ /* physical memory regions */ diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c index e6ab428287aef..7389e01991448 100644 --- a/arch/arm/mach-pxa/xcep.c +++ b/arch/arm/mach-pxa/xcep.c @@ -25,7 +25,7 @@ #include #include "pxa25x.h" -#include +#include "addr-map.h" #include #include "generic.h"