Commit 4c811b99 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Gregory CLEMENT
Browse files

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: 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 5cdbe5d2

arch/arm/mach-mv78xx0/include/mach/bridge-regs.h→arch/arm/mach-mv78xx0/bridge-regs.h

+1 −3
Original line number Diff line number Diff line 
/*

 * 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

arch/arm/mach-mv78xx0/buffalo-wxl-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

arch/arm/mach-mv78xx0/common.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-mv78xx0/db78x00-bp-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

arch/arm/mach-mv78xx0/include/mach/hardware.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE