mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
ARM: mmp: make all header files local
The mach/*.h headers are now inaccessible to any external code, so we can move them all into the mach-mmp directory itself and remove the subdirectories. A few headers are not used at all, so we remove them here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
parent
8bf42cc888
commit
b501fd7b1c
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/addr-map.h
|
||||
*
|
||||
* Common address map definitions
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -22,14 +22,14 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-pxa168.h>
|
||||
#include <mach/pxa168.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <video/pxa168fb.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/platform_data/keypad-pxa27x.h>
|
||||
|
||||
#include "addr-map.h"
|
||||
#include "mfp-pxa168.h"
|
||||
#include "pxa168.h"
|
||||
#include "irqs.h"
|
||||
#include "common.h"
|
||||
|
||||
static unsigned long common_pin_config[] __initdata = {
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-pxa168.h>
|
||||
#include <mach/pxa168.h>
|
||||
#include <mach/irqs.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-pxa168.h"
|
||||
#include "pxa168.h"
|
||||
#include "irqs.h"
|
||||
|
||||
|
||||
#include "common.h"
|
||||
|
||||
@ -22,10 +22,10 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-mmp2.h>
|
||||
#include <mach/mmp2.h>
|
||||
#include <mach/irqs.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-mmp2.h"
|
||||
#include "mmp2.h"
|
||||
#include "irqs.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/clk/mmp.h>
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "clock.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/clk/mmp.h>
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "clock.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/clk/mmp.h>
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#include "common.h"
|
||||
#include "clock.h"
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <mach/regs-apbc.h>
|
||||
#include "regs-apbc.h"
|
||||
#include "clock.h"
|
||||
|
||||
static void apbc_clk_enable(struct clk *clk)
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/clock.h
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
#include <asm/page.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/system_misc.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/cputype.h>
|
||||
#include "addr-map.h"
|
||||
#include "cputype.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
#include <linux/delay.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/regs-usb.h>
|
||||
#include "irqs.h"
|
||||
#include "devices.h"
|
||||
#include "cputype.h"
|
||||
#include "regs-usb.h"
|
||||
|
||||
int __init pxa_register_device(struct pxa_device_desc *desc,
|
||||
void *data, size_t size)
|
||||
|
||||
@ -21,10 +21,10 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-mmp2.h>
|
||||
#include <mach/mmp2.h>
|
||||
#include <mach/irqs.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-mmp2.h"
|
||||
#include "mmp2.h"
|
||||
#include "irqs.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/pxa168.h>
|
||||
#include <mach/mfp-pxa168.h>
|
||||
#include "irqs.h"
|
||||
#include "pxa168.h"
|
||||
#include "mfp-pxa168.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
#ifndef __ASM_MACH_HARDWARE_H
|
||||
#define __ASM_MACH_HARDWARE_H
|
||||
|
||||
#endif /* __ASM_MACH_HARDWARE_H */
|
||||
@ -1,37 +0,0 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/regs-smc.h
|
||||
*
|
||||
* Static Memory Controller Registers
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_MACH_REGS_SMC_H
|
||||
#define __ASM_MACH_REGS_SMC_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
|
||||
#define SMC_VIRT_BASE (AXI_VIRT_BASE + 0x83800)
|
||||
#define SMC_REG(x) (SMC_VIRT_BASE + (x))
|
||||
|
||||
#define SMC_MSC0 SMC_REG(0x0020)
|
||||
#define SMC_MSC1 SMC_REG(0x0024)
|
||||
#define SMC_SXCNFG0 SMC_REG(0x0030)
|
||||
#define SMC_SXCNFG1 SMC_REG(0x0034)
|
||||
#define SMC_MEMCLKCFG SMC_REG(0x0068)
|
||||
#define SMC_CSDFICFG0 SMC_REG(0x0090)
|
||||
#define SMC_CSDFICFG1 SMC_REG(0x0094)
|
||||
#define SMC_CLK_RET_DEL SMC_REG(0x00b0)
|
||||
#define SMC_ADV_RET_DEL SMC_REG(0x00b4)
|
||||
#define SMC_CSADRMAP0 SMC_REG(0x00c0)
|
||||
#define SMC_CSADRMAP1 SMC_REG(0x00c4)
|
||||
#define SMC_WE_AP0 SMC_REG(0x00e0)
|
||||
#define SMC_WE_AP1 SMC_REG(0x00e4)
|
||||
#define SMC_OE_AP0 SMC_REG(0x00f0)
|
||||
#define SMC_OE_AP1 SMC_REG(0x00f4)
|
||||
#define SMC_ADV_AP0 SMC_REG(0x0100)
|
||||
#define SMC_ADV_AP1 SMC_REG(0x0104)
|
||||
|
||||
#endif /* __ASM_MACH_REGS_SMC_H */
|
||||
@ -20,12 +20,12 @@
|
||||
#include <linux/mfd/max8925.h>
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#include <mach/irqs.h>
|
||||
#include "irqs.h"
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-mmp2.h>
|
||||
#include <mach/mmp2.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-mmp2.h"
|
||||
#include "mmp2.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef __ASM_MACH_MFP_MMP2_H
|
||||
#define __ASM_MACH_MFP_MMP2_H
|
||||
|
||||
#include <mach/mfp.h>
|
||||
#include "mfp.h"
|
||||
|
||||
#define MFP_DRIVE_VERY_SLOW (0x0 << 13)
|
||||
#define MFP_DRIVE_SLOW (0x2 << 13)
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef __ASM_MACH_MFP_PXA168_H
|
||||
#define __ASM_MACH_MFP_PXA168_H
|
||||
|
||||
#include <mach/mfp.h>
|
||||
#include "mfp.h"
|
||||
|
||||
#define MFP_DRIVE_VERY_SLOW (0x0 << 13)
|
||||
#define MFP_DRIVE_SLOW (0x1 << 13)
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef __ASM_MACH_MFP_PXA910_H
|
||||
#define __ASM_MACH_MFP_PXA910_H
|
||||
|
||||
#include <mach/mfp.h>
|
||||
#include "mfp.h"
|
||||
|
||||
#define MFP_DRIVE_VERY_SLOW (0x0 << 13)
|
||||
#define MFP_DRIVE_SLOW (0x2 << 13)
|
||||
@ -21,14 +21,14 @@
|
||||
#include <asm/hardware/cache-tauros2.h>
|
||||
|
||||
#include <asm/mach/time.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/regs-apbc.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/mfp.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/mmp2.h>
|
||||
#include <mach/pm-mmp2.h>
|
||||
#include "addr-map.h"
|
||||
#include "regs-apbc.h"
|
||||
#include "cputype.h"
|
||||
#include "irqs.h"
|
||||
#include "mfp.h"
|
||||
#include "devices.h"
|
||||
#include "mmp2.h"
|
||||
#include "pm-mmp2.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -10,9 +10,10 @@ extern void mmp2_clear_pmic_int(void);
|
||||
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/i2c/pxa-i2c.h>
|
||||
#include <mach/devices.h>
|
||||
#include <linux/platform_data/dma-mmp_tdma.h>
|
||||
|
||||
#include "devices.h"
|
||||
|
||||
extern struct pxa_device_desc mmp2_device_uart1;
|
||||
extern struct pxa_device_desc mmp2_device_uart2;
|
||||
extern struct pxa_device_desc mmp2_device_uart3;
|
||||
@ -18,12 +18,12 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/pm-mmp2.h>
|
||||
#include <mach/regs-icu.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
#include "cputype.h"
|
||||
#include "addr-map.h"
|
||||
#include "pm-mmp2.h"
|
||||
#include "regs-icu.h"
|
||||
#include "irqs.h"
|
||||
|
||||
int mmp2_set_wake(struct irq_data *d, unsigned int on)
|
||||
{
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#ifndef __MMP2_PM_H__
|
||||
#define __MMP2_PM_H__
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#define APMU_PJ_IDLE_CFG APMU_REG(0x018)
|
||||
#define APMU_PJ_IDLE_CFG_PJ_IDLE (1 << 1)
|
||||
@ -19,12 +19,12 @@
|
||||
#include <linux/irq.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/outercache.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/pm-pxa910.h>
|
||||
#include <mach/regs-icu.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
#include "cputype.h"
|
||||
#include "addr-map.h"
|
||||
#include "pm-pxa910.h"
|
||||
#include "regs-icu.h"
|
||||
#include "irqs.h"
|
||||
|
||||
int pxa910_set_wake(struct irq_data *data, unsigned int on)
|
||||
{
|
||||
|
||||
@ -16,22 +16,22 @@
|
||||
#include <linux/clk/mmp.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/platform_data/mv_usb.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <asm/mach/time.h>
|
||||
#include <asm/system_misc.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/regs-apbc.h>
|
||||
#include <mach/regs-apmu.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/mfp.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <mach/pxa168.h>
|
||||
#include <mach/regs-usb.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "addr-map.h"
|
||||
#include "clock.h"
|
||||
#include "common.h"
|
||||
#include "cputype.h"
|
||||
#include "devices.h"
|
||||
#include "irqs.h"
|
||||
#include "mfp.h"
|
||||
#include "pxa168.h"
|
||||
#include "regs-apbc.h"
|
||||
#include "regs-apmu.h"
|
||||
#include "regs-usb.h"
|
||||
|
||||
#define MFPR_VIRT_BASE (APB_VIRT_BASE + 0x1e000)
|
||||
|
||||
|
||||
@ -11,14 +11,15 @@ extern void pxa168_clear_keypad_wakeup(void);
|
||||
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/i2c/pxa-i2c.h>
|
||||
#include <mach/devices.h>
|
||||
#include <linux/platform_data/mtd-nand-pxa3xx.h>
|
||||
#include <video/pxa168fb.h>
|
||||
#include <linux/platform_data/keypad-pxa27x.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <linux/pxa168_eth.h>
|
||||
#include <linux/platform_data/mv_usb.h>
|
||||
|
||||
#include "devices.h"
|
||||
#include "cputype.h"
|
||||
|
||||
extern struct pxa_device_desc pxa168_device_uart1;
|
||||
extern struct pxa_device_desc pxa168_device_uart2;
|
||||
extern struct pxa_device_desc pxa168_device_uart3;
|
||||
@ -19,14 +19,14 @@
|
||||
|
||||
#include <asm/hardware/cache-tauros2.h>
|
||||
#include <asm/mach/time.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/regs-apbc.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/mfp.h>
|
||||
#include <mach/devices.h>
|
||||
#include <mach/pm-pxa910.h>
|
||||
#include <mach/pxa910.h>
|
||||
#include "addr-map.h"
|
||||
#include "regs-apbc.h"
|
||||
#include "cputype.h"
|
||||
#include "irqs.h"
|
||||
#include "mfp.h"
|
||||
#include "devices.h"
|
||||
#include "pm-pxa910.h"
|
||||
#include "pxa910.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -7,10 +7,11 @@ extern void __init pxa910_init_irq(void);
|
||||
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/i2c/pxa-i2c.h>
|
||||
#include <mach/devices.h>
|
||||
#include <linux/platform_data/mtd-nand-pxa3xx.h>
|
||||
#include <video/mmp_disp.h>
|
||||
|
||||
#include "devices.h"
|
||||
|
||||
extern struct pxa_device_desc pxa910_device_uart1;
|
||||
extern struct pxa_device_desc pxa910_device_uart2;
|
||||
extern struct pxa_device_desc pxa910_device_twsi0;
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/regs-apbc.h
|
||||
*
|
||||
* Application Peripheral Bus Clock Unit
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -11,7 +9,7 @@
|
||||
#ifndef __ASM_MACH_REGS_APBC_H
|
||||
#define __ASM_MACH_REGS_APBC_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
/* Common APB clock register bit definitions */
|
||||
#define APBC_APBCLK (1 << 0) /* APB Bus Clock Enable */
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/regs-apmu.h
|
||||
*
|
||||
* Application Subsystem Power Management Unit
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -11,7 +9,7 @@
|
||||
#ifndef __ASM_MACH_REGS_APMU_H
|
||||
#define __ASM_MACH_REGS_APMU_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#define APMU_FNCLK_EN (1 << 4)
|
||||
#define APMU_AXICLK_EN (1 << 3)
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/regs-icu.h
|
||||
*
|
||||
* Interrupt Control Unit
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -11,7 +9,7 @@
|
||||
#ifndef __ASM_MACH_ICU_H
|
||||
#define __ASM_MACH_ICU_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#define ICU_VIRT_BASE (AXI_VIRT_BASE + 0x82000)
|
||||
#define ICU_REG(x) (ICU_VIRT_BASE + (x))
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/regs-timers.h
|
||||
*
|
||||
* Timers Module
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -11,7 +9,7 @@
|
||||
#ifndef __ASM_MACH_REGS_TIMERS_H
|
||||
#define __ASM_MACH_REGS_TIMERS_H
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include "addr-map.h"
|
||||
|
||||
#define TIMERS1_VIRT_BASE (APB_VIRT_BASE + 0x14000)
|
||||
#define TIMERS2_VIRT_BASE (APB_VIRT_BASE + 0x16000)
|
||||
@ -16,10 +16,10 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-pxa910.h>
|
||||
#include <mach/pxa910.h>
|
||||
#include <mach/irqs.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-pxa910.h"
|
||||
#include "pxa910.h"
|
||||
#include "irqs.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -23,11 +23,11 @@
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-pxa168.h>
|
||||
#include <mach/pxa168.h>
|
||||
#include <mach/teton_bga.h>
|
||||
#include <mach/irqs.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-pxa168.h"
|
||||
#include "pxa168.h"
|
||||
#include "teton_bga.h"
|
||||
#include "irqs.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
/*
|
||||
* linux/arch/arm/mach-mmp/include/mach/teton_bga.h
|
||||
*
|
||||
* Support for the Marvell PXA168 Teton BGA Development Platform.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -29,14 +29,13 @@
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/sched_clock.h>
|
||||
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/regs-timers.h>
|
||||
#include <mach/regs-apbc.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/cputype.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#include "addr-map.h"
|
||||
#include "regs-timers.h"
|
||||
#include "regs-apbc.h"
|
||||
#include "irqs.h"
|
||||
#include "cputype.h"
|
||||
#include "clock.h"
|
||||
|
||||
#ifdef CONFIG_CPU_MMP2
|
||||
|
||||
@ -26,11 +26,11 @@
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/flash.h>
|
||||
#include <mach/addr-map.h>
|
||||
#include <mach/mfp-pxa910.h>
|
||||
#include <mach/pxa910.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <mach/regs-usb.h>
|
||||
#include "addr-map.h"
|
||||
#include "mfp-pxa910.h"
|
||||
#include "pxa910.h"
|
||||
#include "irqs.h"
|
||||
#include "regs-usb.h"
|
||||
|
||||
#include "common.h"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user