ARM: pxa: move mach/*.h to mach-pxa/

None of the headers are included from outside of the mach-pxa
directory, so move them all in there.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-04-04 22:37:04 +02:00
parent c8a9142894
commit e6acc4062c
70 changed files with 133 additions and 134 deletions

View File

@ -30,7 +30,7 @@
#include "gumstix.h"
#include "mfp-pxa25x.h"
#include <mach/irqs.h>
#include "irqs.h"
#include <linux/platform_data/video-pxafb.h>
#include "generic.h"

View File

@ -11,7 +11,7 @@
#ifndef ASM_ARCH_BALLOON3_H
#define ASM_ARCH_BALLOON3_H
#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
enum balloon3_features {
BALLOON3_FEATURE_OHCI,

View File

@ -17,7 +17,7 @@
#include <asm/system_info.h>
#include <asm/mach/arch.h>
#include <asm/mach/irq.h>
#include <mach/pxa3xx-regs.h>
#include "pxa3xx-regs.h"
#include "mfp-pxa300.h"
#include "colibri.h"
#include <linux/platform_data/mmc-pxamci.h>

View File

@ -3,7 +3,7 @@
#define _COLIBRI_H_
#include <net/ax88796.h>
#include <mach/mfp.h>
#include "mfp.h"
/*
* base board glue for PXA270 module

View File

@ -9,7 +9,7 @@
#ifndef __ASM_ARCH_CORGI_H
#define __ASM_ARCH_CORGI_H 1
#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
/*
* Corgi (Non Standard) GPIO Definitions

View File

@ -21,7 +21,7 @@
#include <asm/mach-types.h>
#include "corgi.h"
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "sharpsl_pm.h"
#include "generic.h"

View File

@ -23,7 +23,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -7,7 +7,7 @@
#ifndef CSB726_H
#define CSB726_H
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
#define CSB726_GPIO_IRQ_LAN 52
#define CSB726_GPIO_IRQ_SM501 53

View File

@ -16,7 +16,7 @@
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <mach/irqs.h>
#include "irqs.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/media/camera-pxa.h>
@ -24,8 +24,8 @@
#include <linux/platform_data/mmp_dma.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>
#include <mach/regs-ost.h>
#include <mach/reset.h>
#include "regs-ost.h"
#include "reset.h"
#include "devices.h"
#include "generic.h"

View File

@ -13,7 +13,7 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <mach/eseries-gpio.h>
#include "eseries-gpio.h"
#include <asm/irq.h>
#include <asm/mach-types.h>

View File

@ -33,7 +33,7 @@
#include <asm/mach-types.h>
#include "pxa25x.h"
#include <mach/eseries-gpio.h>
#include "eseries-gpio.h"
#include "eseries-irq.h"
#include <linux/platform_data/asoc-pxa.h>
#include <linux/platform_data/video-pxafb.h>

View File

@ -25,10 +25,10 @@
#include <asm/mach-types.h>
#include "addr-map.h"
#include <mach/irqs.h>
#include <mach/reset.h>
#include <mach/smemc.h>
#include <mach/pxa3xx-regs.h>
#include "irqs.h"
#include "reset.h"
#include "smemc.h"
#include "pxa3xx-regs.h"
#include "generic.h"
#include <clocksource/pxa.h>

View File

@ -3,7 +3,7 @@
* arch/arm/mach-pxa/include/mach/gumstix.h
*/
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* BTRESET - Reset line to Bluetooth module, active low signal. */
#define GPIO_GUMSTIX_BTRESET 7

View File

@ -29,7 +29,7 @@
#include "pxa25x.h"
#include "h5000.h"
#include "udc.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"

View File

@ -10,7 +10,7 @@
#include <linux/gpio.h>
#include <linux/mfd/asic3.h>
#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
#define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO
#define HX4700_EGPIO_BASE (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)

View File

@ -20,7 +20,7 @@
* IDP hardware.
*/
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
#define IDP_FLASH_PHYS (PXA_CS0_PHYS)
#define IDP_ALT_FLASH_PHYS (PXA_CS1_PHYS)

View File

@ -1,52 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Author: Nicolas Pitre
* Created: Jun 15, 2001
* Copyright: MontaVista Software Inc.
*/
#ifndef __ASM_MACH_PXA_REGS_H
#define __ASM_MACH_PXA_REGS_H
/*
* Workarounds for at least 2 errata so far require this.
* The mapping is set in mach-pxa/generic.c.
*/
#define UNCACHED_PHYS_0 0xfe000000
#define UNCACHED_PHYS_0_SIZE 0x00100000
/*
* Intel PXA2xx internal register mapping:
*
* 0x40000000 - 0x41ffffff <--> 0xf2000000 - 0xf3ffffff
* 0x44000000 - 0x45ffffff <--> 0xf4000000 - 0xf5ffffff
* 0x48000000 - 0x49ffffff <--> 0xf6000000 - 0xf7ffffff
* 0x4c000000 - 0x4dffffff <--> 0xf8000000 - 0xf9ffffff
* 0x50000000 - 0x51ffffff <--> 0xfa000000 - 0xfbffffff
* 0x54000000 - 0x55ffffff <--> 0xfc000000 - 0xfdffffff
* 0x58000000 - 0x59ffffff <--> 0xfe000000 - 0xffffffff
*
* Note that not all PXA2xx chips implement all those addresses, and the
* kernel only maps the minimum needed range of this mapping.
*/
#define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
#ifndef __ASSEMBLY__
# define __REG(x) (*((volatile u32 __iomem *)io_p2v(x)))
/* With indexed regs we don't want to feed the index through io_p2v()
especially if it is a variable, otherwise horrible code will result. */
# define __REG2(x,y) \
(*(volatile u32 __iomem*)((u32)&__REG(x) + (y)))
# define __PREG(x) (io_v2p((u32)&(x)))
#else
# define __REG(x) io_p2v(x)
# define __PREG(x) io_v2p(x)
#endif
#endif

View File

@ -21,7 +21,7 @@
#include <asm/exception.h>
#include <mach/irqs.h>
#include "irqs.h"
#include "generic.h"
#include "pxa-regs.h"

View File

@ -44,7 +44,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -52,7 +52,7 @@
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include "pm.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -5,7 +5,7 @@
* Copyright: MontaVista Software Inc.
*/
#include <mach/irqs.h>
#include "irqs.h"
#define LUBBOCK_ETH_PHYS PXA_CS3_PHYS

View File

@ -35,7 +35,7 @@
#include "pxa27x.h"
#include "addr-map.h"
#include <mach/magician.h>
#include "magician.h"
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>

View File

@ -9,7 +9,7 @@
#define _MAGICIAN_H_
#include <linux/gpio.h>
#include <mach/irqs.h>
#include "irqs.h"
/*
* PXA GPIOs

View File

@ -52,7 +52,7 @@
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include "addr-map.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -8,7 +8,7 @@
#ifndef ASM_ARCH_MAINSTONE_H
#define ASM_ARCH_MAINSTONE_H
#include <mach/irqs.h>
#include "irqs.h"
#define MST_ETH_PHYS PXA_CS4_PHYS

View File

@ -18,7 +18,7 @@
#include <linux/syscore_ops.h>
#include <linux/soc/pxa/cpu.h>
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "mfp-pxa2xx.h"
#include "generic.h"

View File

@ -17,7 +17,7 @@
#include <linux/syscore_ops.h>
#include "mfp-pxa3xx.h"
#include <mach/pxa3xx-regs.h>
#include "pxa3xx-regs.h"
#ifdef CONFIG_PM
/*

View File

@ -42,7 +42,7 @@
#include "pxa27x-udc.h"
#include <linux/platform_data/media/camera-pxa.h>
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include "smemc.h"
#include "mioa701.h"

View File

@ -9,7 +9,7 @@
#ifndef _INCLUDE_PALMLD_H_
#define _INCLUDE_PALMLD_H_
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/

View File

@ -11,7 +11,7 @@
#ifndef _INCLUDE_PALMT5_H_
#define _INCLUDE_PALMT5_H_
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/

View File

@ -12,7 +12,7 @@
#ifndef _INCLUDE_PALMTC_H_
#define _INCLUDE_PALMTC_H_
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/

View File

@ -37,7 +37,7 @@
#include <linux/platform_data/keypad-pxa27x.h>
#include "udc.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include <linux/platform_data/asoc-palm27x.h>
#include <linux/platform_data/media/camera-pxa.h>
#include "palm27x.h"

View File

@ -12,7 +12,7 @@
#ifndef _INCLUDE_PALMTX_H_
#define _INCLUDE_PALMTX_H_
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/** HERE ARE GPIOs **/

View File

@ -10,7 +10,7 @@
* Definitions of CPU card resources only
*/
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* phyCORE-PXA270 (PCM027) Interrupts */
#define PCM027_IRQ(x) (IRQ_BOARD_START + (x))

View File

@ -7,7 +7,7 @@
*/
#include "pcm027.h"
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/*
* definitions relevant only when the PCM-990

View File

@ -15,7 +15,7 @@
#ifndef __ASM_ARCH_POODLE_H
#define __ASM_ARCH_POODLE_H 1
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/*
* GPIOs

View File

@ -11,7 +11,7 @@
#include <linux/of_platform.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <mach/irqs.h>
#include "irqs.h"
#include "generic.h"

View File

@ -1 +1,52 @@
#include <mach/pxa-regs.h>
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Author: Nicolas Pitre
* Created: Jun 15, 2001
* Copyright: MontaVista Software Inc.
*/
#ifndef __ASM_MACH_PXA_REGS_H
#define __ASM_MACH_PXA_REGS_H
/*
* Workarounds for at least 2 errata so far require this.
* The mapping is set in mach-pxa/generic.c.
*/
#define UNCACHED_PHYS_0 0xfe000000
#define UNCACHED_PHYS_0_SIZE 0x00100000
/*
* Intel PXA2xx internal register mapping:
*
* 0x40000000 - 0x41ffffff <--> 0xf2000000 - 0xf3ffffff
* 0x44000000 - 0x45ffffff <--> 0xf4000000 - 0xf5ffffff
* 0x48000000 - 0x49ffffff <--> 0xf6000000 - 0xf7ffffff
* 0x4c000000 - 0x4dffffff <--> 0xf8000000 - 0xf9ffffff
* 0x50000000 - 0x51ffffff <--> 0xfa000000 - 0xfbffffff
* 0x54000000 - 0x55ffffff <--> 0xfc000000 - 0xfdffffff
* 0x58000000 - 0x59ffffff <--> 0xfe000000 - 0xffffffff
*
* Note that not all PXA2xx chips implement all those addresses, and the
* kernel only maps the minimum needed range of this mapping.
*/
#define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
#ifndef __ASSEMBLY__
# define __REG(x) (*((volatile u32 __iomem *)io_p2v(x)))
/* With indexed regs we don't want to feed the index through io_p2v()
especially if it is a variable, otherwise horrible code will result. */
# define __REG2(x,y) \
(*(volatile u32 __iomem*)((u32)&__REG(x) + (y)))
# define __PREG(x) (io_v2p((u32)&(x)))
#else
# define __REG(x) io_p2v(x)
# define __PREG(x) io_v2p(x)
#endif
#endif

View File

@ -30,12 +30,12 @@
#include <asm/mach/map.h>
#include <asm/suspend.h>
#include <mach/irqs.h>
#include "irqs.h"
#include "pxa25x.h"
#include <mach/reset.h>
#include "reset.h"
#include "pm.h"
#include "addr-map.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -3,8 +3,8 @@
#define __MACH_PXA25x_H
#include "addr-map.h"
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "mfp-pxa25x.h"
#include <mach/irqs.h>
#include "irqs.h"
#endif /* __MACH_PXA25x_H */

View File

@ -28,13 +28,13 @@
#include <asm/mach/map.h>
#include <asm/irq.h>
#include <asm/suspend.h>
#include <mach/irqs.h>
#include "irqs.h"
#include "pxa27x.h"
#include <mach/reset.h>
#include "reset.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include "pm.h"
#include "addr-map.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -4,9 +4,9 @@
#include <linux/suspend.h>
#include "addr-map.h"
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "mfp-pxa27x.h"
#include <mach/irqs.h>
#include "irqs.h"
#define ARB_CNTRL __REG(0x48000048) /* Arbiter Control Register */

View File

@ -12,11 +12,11 @@
#include <linux/device.h>
#include <linux/io.h>
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "mfp-pxa25x.h"
#include "generic.h"
#include <mach/reset.h>
#include <mach/smemc.h>
#include "reset.h"
#include "smemc.h"
#include <linux/soc/pxa/smemc.h>
#include <linux/platform_data/irda-pxaficp.h>

View File

@ -29,13 +29,13 @@
#include <asm/mach/map.h>
#include <asm/suspend.h>
#include <mach/pxa3xx-regs.h>
#include <mach/reset.h>
#include "pxa3xx-regs.h"
#include "reset.h"
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include "pm.h"
#include "addr-map.h"
#include <mach/smemc.h>
#include <mach/irqs.h>
#include "smemc.h"
#include "irqs.h"
#include "generic.h"
#include "devices.h"

View File

@ -3,7 +3,7 @@
#define __MACH_PXA3XX_H
#include "addr-map.h"
#include <mach/pxa3xx-regs.h>
#include <mach/irqs.h>
#include "pxa3xx-regs.h"
#include "irqs.h"
#endif /* __MACH_PXA3XX_H */

View File

@ -7,9 +7,9 @@
#include <asm/proc-fns.h>
#include <asm/system_misc.h>
#include <mach/regs-ost.h>
#include <mach/reset.h>
#include <mach/smemc.h>
#include "regs-ost.h"
#include "reset.h"
#include "smemc.h"
static void do_hw_reset(void);

View File

@ -24,7 +24,7 @@
#include <asm/mach-types.h>
#include "pm.h"
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "regs-rtc.h"
#include "sharpsl_pm.h"

View File

@ -13,8 +13,8 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/smemc.h>
#include <mach/pxa2xx-regs.h>
#include "smemc.h"
#include "pxa2xx-regs.h"
#define MDREFR_KDIV 0x200a4000 // all banks
#define CCCR_SLEEP 0x00000107 // L=7 2N=2 A=0 PPDIS=0 CPDIS=0

View File

@ -10,7 +10,7 @@
#include <linux/syscore_ops.h>
#include <linux/soc/pxa/cpu.h>
#include <mach/smemc.h>
#include "smemc.h"
#include <linux/soc/pxa/smemc.h>
#ifdef CONFIG_PM

View File

@ -39,14 +39,14 @@
#include "pxa27x.h"
#include "pxa27x-udc.h"
#include <mach/reset.h>
#include "reset.h"
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
#include "spitz.h"
#include "sharpsl_pm.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -11,7 +11,7 @@
#define __ASM_ARCH_SPITZ_H 1
#endif
#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_NR_BUILTIN_GPIO, PXA_GPIO_TO_IRQ */
#include <linux/fb.h>
/* Spitz/Akita GPIOs */

View File

@ -12,7 +12,7 @@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
.text

View File

@ -40,16 +40,16 @@
#include <asm/mach-types.h>
#include "pxa25x.h"
#include <mach/reset.h>
#include "reset.h"
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/mmc-pxamci.h>
#include "udc.h"
#include "tosa_bt.h"
#include <linux/platform_data/asoc-pxa.h>
#include <mach/smemc.h>
#include "smemc.h"
#include <asm/mach/arch.h>
#include <mach/tosa.h>
#include "tosa.h"
#include <asm/hardware/scoop.h>
#include <asm/mach/sharpsl_param.h>

View File

@ -19,7 +19,7 @@
#include <asm/mach-types.h>
#include <asm/irq.h>
#include <mach/pxa2xx-regs.h>
#include "pxa2xx-regs.h"
#include "trizeps4.h"
#include <pcmcia/soc_common.h>

View File

@ -46,7 +46,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -12,7 +12,7 @@
#define _TRIPEPS4_H_
#include "addr-map.h"
#include <mach/irqs.h> /* PXA_GPIO_TO_IRQ */
#include "irqs.h" /* PXA_GPIO_TO_IRQ */
/* physical memory regions */
#define TRIZEPS4_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */

View File

@ -26,7 +26,7 @@
#include "pxa25x.h"
#include "addr-map.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"
#include "devices.h"

View File

@ -34,7 +34,7 @@
#include "pxa27x.h"
#include "mfp-pxa27x.h"
#include <mach/z2.h>
#include "z2.h"
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/keypad-pxa27x.h>

View File

@ -49,7 +49,7 @@
#include <linux/platform_data/asoc-pxa.h>
#include "viper-pcmcia.h"
#include "zeus.h"
#include <mach/smemc.h>
#include "smemc.h"
#include "generic.h"

View File

@ -32,7 +32,7 @@
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>
#include <mach/mfp.h>
#include "mfp.h"
#include "devices.h"
#include "generic.h"