Commit c22c2c60 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Gregory CLEMENT

ARM: orion5x: clean up mach/*.h headers

This is a simple move of all header files that are no longer
included by anything else from the include/mach directory
to the platform directory itself as preparation for
multiplatform support.

The mach/uncompress.h headers are left in place for now,
and are mildly modified to be independent of the other
headers. They will be removed entirely when ARCH_MULTIPLATFORM
gets enabled and they become obsolete.

Rather than updating the path names inside of the comments
of each header, I delete those comments to avoid having to
update them again, should they get moved or copied another
time.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 43dad399
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include <plat/orion-gpio.h> #include <plat/orion-gpio.h>
#include "common.h" #include "common.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* LaCie d2 Network Info * LaCie d2 Network Info
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#include <asm/system_misc.h> #include <asm/system_misc.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/orion5x.h>
#include <mach/bridge-regs.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <plat/time.h> #include <plat/time.h>
#include "orion5x.h"
#include "bridge-regs.h"
#include "common.h" #include "common.h"
static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = { static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h> #include "orion5x.h"
#include <mach/bridge-regs.h> #include "bridge-regs.h"
#include "common.h" #include "common.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* RD-88F5182 Info * RD-88F5182 Info
......
/* /*
* arch/arm/mach-orion5x/include/mach/bridge-regs.h
*
* Orion CPU Bridge Registers * Orion CPU Bridge Registers
* *
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
...@@ -11,7 +9,7 @@ ...@@ -11,7 +9,7 @@
#ifndef __ASM_ARCH_BRIDGE_REGS_H #ifndef __ASM_ARCH_BRIDGE_REGS_H
#define __ASM_ARCH_BRIDGE_REGS_H #define __ASM_ARCH_BRIDGE_REGS_H
#include <mach/orion5x.h> #include "orion5x.h"
#define CPU_CONF (ORION5X_BRIDGE_VIRT_BASE + 0x100) #define CPU_CONF (ORION5X_BRIDGE_VIRT_BASE + 0x100)
......
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/bridge-regs.h>
#include <mach/hardware.h>
#include <mach/orion5x.h>
#include <linux/platform_data/mtd-orion_nand.h> #include <linux/platform_data/mtd-orion_nand.h>
#include <linux/platform_data/usb-ehci-orion.h> #include <linux/platform_data/usb-ehci-orion.h>
#include <plat/time.h> #include <plat/time.h>
#include <plat/common.h> #include <plat/common.h>
#include "bridge-regs.h"
#include "common.h" #include "common.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* I/O Address Mapping * I/O Address Mapping
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include <linux/platform_data/mtd-orion_nand.h> #include <linux/platform_data/mtd-orion_nand.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* DB-88F5281 on board devices * DB-88F5281 on board devices
......
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <asm/system_info.h> #include <asm/system_info.h>
#include <mach/orion5x.h>
#include <plat/orion-gpio.h> #include <plat/orion-gpio.h>
#include "orion5x.h"
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
......
/*
* arch/arm/mach-orion5x/include/mach/hardware.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.
*/
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
#include "orion5x.h"
#endif
/* /*
* arch/arm/mach-orion5x/include/mach/uncompress.h
*
* Tzachi Perelstein <tzachi@marvell.com> * Tzachi Perelstein <tzachi@marvell.com>
* *
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
...@@ -9,8 +7,8 @@ ...@@ -9,8 +7,8 @@
*/ */
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <mach/orion5x.h>
#define UART0_PHYS_BASE (0xf1000000 + 0x12000)
#define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE)
static void putc(const char c) static void putc(const char c)
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/bridge-regs.h>
#include <plat/orion-gpio.h> #include <plat/orion-gpio.h>
#include <plat/irq.h> #include <plat/irq.h>
#include <asm/exception.h> #include <asm/exception.h>
#include "bridge-regs.h"
#include "common.h" #include "common.h"
static int __initdata gpio0_irqs[4] = { static int __initdata gpio0_irqs[4] = {
......
/* /*
* arch/arm/mach-orion5x/include/mach/irqs.h
*
* IRQ definitions for Orion SoC * IRQ definitions for Orion SoC
* *
* Maintainer: Tzachi Perelstein <tzachi@marvell.com> * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include <linux/platform_data/mtd-orion_nand.h> #include <linux/platform_data/mtd-orion_nand.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* KUROBOX-PRO Info * KUROBOX-PRO Info
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* Linkstation LS-CHL Info * Linkstation LS-CHL Info
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* Linkstation LS-HGL Info * Linkstation LS-HGL Info
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h>
#include <plat/mpp.h> #include <plat/mpp.h>
#include "orion5x.h"
#include "mpp.h" #include "mpp.h"
#include "common.h" #include "common.h"
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <linux/ata_platform.h> #include <linux/ata_platform.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
#define MV2120_NOR_BOOT_BASE 0xf4000000 #define MV2120_NOR_BOOT_BASE 0xf4000000
#define MV2120_NOR_BOOT_SIZE SZ_512K #define MV2120_NOR_BOOT_SIZE SZ_512K
......
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/orion5x.h>
#include <plat/orion-gpio.h> #include <plat/orion-gpio.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* LaCie 2Big Network Info * LaCie 2Big Network Info
......
/* /*
* arch/arm/mach-orion5x/include/mach/orion5x.h
*
* Generic definitions of Orion SoC flavors: * Generic definitions of Orion SoC flavors:
* Orion-1, Orion-VoIP, Orion-NAS, Orion-2, and Orion-1-90. * Orion-1, Orion-VoIP, Orion-NAS, Orion-2, and Orion-1-90.
* *
...@@ -14,7 +12,7 @@ ...@@ -14,7 +12,7 @@
#ifndef __ASM_ARCH_ORION5X_H #ifndef __ASM_ARCH_ORION5X_H
#define __ASM_ARCH_ORION5X_H #define __ASM_ARCH_ORION5X_H
#include <mach/irqs.h> #include "irqs.h"
/***************************************************************************** /*****************************************************************************
* Orion Address Maps * Orion Address Maps
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <plat/pcie.h> #include <plat/pcie.h>
#include <plat/addr-map.h> #include <plat/addr-map.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* Orion has one PCIe controller and one PCI controller. * Orion has one PCIe controller and one PCI controller.
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* RD-88F5181L FXO Info * RD-88F5181L FXO Info
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* RD-88F5181L GE Info * RD-88F5181L GE Info
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* RD-88F5182 Info * RD-88F5182 Info
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "orion5x.h"
static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = { static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = {
.phy_addr = -1, .phy_addr = -1,
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
/***************************************************************************** /*****************************************************************************
* Terastation Pro 2/Live Info * Terastation Pro 2/Live Info
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
#include "tsx09-common.h" #include "tsx09-common.h"
#define QNAP_TS209_NOR_BOOT_BASE 0xf4000000 #define QNAP_TS209_NOR_BOOT_BASE 0xf4000000
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
#include "tsx09-common.h" #include "tsx09-common.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/orion5x.h>
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
#include "orion5x.h"
#include "ts78xx-fpga.h" #include "ts78xx-fpga.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <linux/mv643xx_eth.h> #include <linux/mv643xx_eth.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <mach/orion5x.h> #include "orion5x.h"
#include "tsx09-common.h" #include "tsx09-common.h"
#include "common.h" #include "common.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h> #include "orion5x.h"
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/pci.h> #include <asm/mach/pci.h>
#include <mach/orion5x.h> #include "orion5x.h"
#include "common.h" #include "common.h"
#include "mpp.h" #include "mpp.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment