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 <philipp.zabel@gmail.com>
Cc: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 (file)
index 0000000..93cfe7d
--- /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 3c3cd90bb9b4b87b986779de7b7a71d5c93eca76..f9083c4f0aea1cda64e7d8314d6e27763d6f7563 100644 (file)
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -22,7 +22,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/irqs.h>
 #include <mach/reset.h>
 #include <mach/smemc.h>

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 191a6c24fe19d1eda998ce85e3d7ac2e7851d05d..140a44cb298913eb4d21586f39856c80f193213b 100644 (file)
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -40,7 +40,7 @@
 #include <asm/mach/arch.h>
 
 #include "pxa27x.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/hx4700.h>
 #include <linux/platform_data/irda-pxaficp.h>
 

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 (file)
index 93cfe7d..0000000
--- 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 7f10b86f85fd7adbc3f436d3e07f0f15f5d0af78..e03436710752f85d4b609783494b9cd59ea3a7bb 100644 (file)
--- 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 <mach/addr-map.h>
+#include "addr-map.h"
 #include <linux/platform_data/asoc-pxa.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 345a44d15a2c19783ab3560817ebf26b78368fc0..20ca3e28c7fbb36a517a933d37c769ec6c2cd053 100644 (file)
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -34,7 +34,7 @@
 #include <asm/system_info.h>
 
 #include "pxa27x.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/magician.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>

diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index c8200fc2159d56bc9b813cb3bd3332f5551509c8..f0072e63b4564a13adc0be14faad4535b484de45 100644 (file)
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -51,7 +51,7 @@
 #include <linux/platform_data/irda-pxaficp.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/keypad-pxa27x.h>
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/smemc.h>
 
 #include "generic.h"

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index dfc90b41fba3148331d4f1fb5aa2741be2c8fe3d..8d21c7eef1d29a20ea198dee21fd45f693d8848c 100644 (file)
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -34,7 +34,7 @@
 #include "pxa25x.h"
 #include <mach/reset.h>
 #include "pm.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/smemc.h>
 
 #include "generic.h"

diff --git a/arch/arm/mach-pxa/pxa25x.h b/arch/arm/mach-pxa/pxa25x.h
index 403bc16c2ed21dfc0d764d4778ea62444b30b287..4699ebf7b486f6a9d3210a749add91e5c0b0f188 100644 (file)
--- 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 <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa25x.h"
 #include <mach/irqs.h>

diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 38fdd22c4dc5c5866b0e8969c70c4e2eab099de8..c36a9784fab8bfc73bcb2e13cb69c066152135be 100644 (file)
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -33,7 +33,7 @@
 #include <mach/reset.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include "pm.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/smemc.h>
 
 #include "generic.h"

diff --git a/arch/arm/mach-pxa/pxa27x.h b/arch/arm/mach-pxa/pxa27x.h
index 6c99090647d2964537f6010ae1a71da28c84379b..bf2755561fe5b193e61a29cca7f25b1202918d74 100644 (file)
--- a/arch/arm/mach-pxa/pxa27x.h
+++ b/arch/arm/mach-pxa/pxa27x.h
@@ -3,7 +3,7 @@
 #define __MACH_PXA27x_H
 
 #include <linux/suspend.h>
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa27x.h"
 #include <mach/irqs.h>

diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 7c569fa2a6da1dfd63dbf879c70dc7787cae0f86..7881888107c7e1be37e40a9a2b78c93e565eb01e 100644 (file)
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -32,7 +32,7 @@
 #include <mach/reset.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include "pm.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/smemc.h>
 #include <mach/irqs.h>
 

diff --git a/arch/arm/mach-pxa/pxa3xx.h b/arch/arm/mach-pxa/pxa3xx.h
index 22ace053ea25a7736c4f835a7d4638b798049e45..6b424d3286802c4c9c504b4f01fe984ce12d2c08 100644 (file)
--- 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 <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/pxa3xx-regs.h>
 #include <mach/irqs.h>
 

diff --git a/arch/arm/mach-pxa/trizeps4.h b/arch/arm/mach-pxa/trizeps4.h
index 7597b9de11e24e02eedaf21a77727414b38464eb..e0f37c0ff06f7f02a017e323de3a0f9f58b99f9e 100644 (file)
--- 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 <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
 
 /* physical memory regions */

diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c
index e6ab428287aef806c61549b0cef1818aa9ee6262..7389e01991448ece8fc6abed9def710632dc1d6a 100644 (file)
--- a/arch/arm/mach-pxa/xcep.c
+++ b/arch/arm/mach-pxa/xcep.c
@@ -25,7 +25,7 @@
 #include <asm/mach/map.h>
 
 #include "pxa25x.h"
-#include <mach/addr-map.h>
+#include "addr-map.h"
 #include <mach/smemc.h>
 
 #include "generic.h"