ARM: mv78xx0: 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: Arnd Bergmann <arnd@arndb.de> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>hifive-unleashed-5.1
Arnd Bergmann
Gregory CLEMENT
parent
5cdbe5d23a
commit
4c811b99b4
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* arch/arm/mach-mv78xx0/include/mach/bridge-regs.h
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
* License version 2. This program is licensed "as is" without any
|
||||
* warranty of any kind, whether express or implied.
|
||||
|
|
@ -9,7 +7,7 @@
|
|||
#ifndef __ASM_ARCH_BRIDGE_REGS_H
|
||||
#define __ASM_ARCH_BRIDGE_REGS_H
|
||||
|
||||
#include <mach/mv78xx0.h>
|
||||
#include "mv78xx0.h"
|
||||
|
||||
#define CPU_CONTROL (BRIDGE_VIRT_BASE + 0x0104)
|
||||
#define L2_WRITETHROUGH 0x00020000
|
||||
|
|
@ -17,9 +17,9 @@
|
|||
#include <linux/mv643xx_eth.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "common.h"
|
||||
#include "mpp.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
#include <asm/hardware/cache-feroceon-l2.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach/time.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
#include <mach/bridge-regs.h>
|
||||
#include <linux/platform_data/usb-ehci-orion.h>
|
||||
#include <linux/platform_data/mtd-orion_nand.h>
|
||||
#include <plat/time.h>
|
||||
#include <plat/common.h>
|
||||
#include <plat/addr-map.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "bridge-regs.h"
|
||||
#include "common.h"
|
||||
|
||||
static int get_tclk(void);
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
#include <linux/mv643xx_eth.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "common.h"
|
||||
|
||||
static struct mv643xx_eth_platform_data db78x00_ge00_data = {
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
/*
|
||||
* arch/arm/mach-mv78xx0/include/mach/hardware.h
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
* License version 2. This program is licensed "as is" without any
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_HARDWARE_H
|
||||
#define __ASM_ARCH_HARDWARE_H
|
||||
|
||||
#include "mv78xx0.h"
|
||||
|
||||
#endif
|
||||
|
|
@ -1,14 +1,12 @@
|
|||
/*
|
||||
* arch/arm/mach-mv78xx0/include/mach/uncompress.h
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
* License version 2. This program is licensed "as is" without any
|
||||
* warranty of any kind, whether express or implied.
|
||||
*/
|
||||
|
||||
#include <linux/serial_reg.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
|
||||
#define UART0_PHYS_BASE (0xf1000000 + 0x12000)
|
||||
#define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE)
|
||||
|
||||
static void putc(const char c)
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
#include <linux/irq.h>
|
||||
#include <linux/io.h>
|
||||
#include <asm/exception.h>
|
||||
#include <mach/bridge-regs.h>
|
||||
#include <plat/orion-gpio.h>
|
||||
#include <plat/irq.h>
|
||||
#include "bridge-regs.h"
|
||||
#include "common.h"
|
||||
|
||||
static int __initdata gpio0_irqs[4] = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* arch/arm/mach-mv78xx0/include/mach/irqs.h
|
||||
*
|
||||
* IRQ definitions for Marvell MV78xx0 SoCs
|
||||
*
|
||||
* This file is licensed under the terms of the GNU General Public
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/io.h>
|
||||
#include <plat/mpp.h>
|
||||
#include <mach/hardware.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "common.h"
|
||||
#include "mpp.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
/*
|
||||
* arch/arm/mach-mv78xx0/include/mach/mv78xx0.h
|
||||
*
|
||||
* Generic definitions for Marvell MV78xx0 SoC flavors:
|
||||
* MV781x0 and MV782x0.
|
||||
*
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/mach/pci.h>
|
||||
#include <plat/pcie.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "common.h"
|
||||
|
||||
#define MV78XX0_MBUS_PCIE_MEM_TARGET(port, lane) ((port) ? 8 : 4)
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
#include <linux/ata_platform.h>
|
||||
#include <linux/mv643xx_eth.h>
|
||||
#include <linux/ethtool.h>
|
||||
#include <mach/mv78xx0.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include "mv78xx0.h"
|
||||
#include "common.h"
|
||||
|
||||
static struct mv643xx_eth_platform_data rd78x00_masa_ge00_data = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue