Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-orion5x/board-d2net.c

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

#include <mach/orion5x.h>

#include <plat/orion-gpio.h>

#include "common.h"

#include "orion5x.h"



/*****************************************************************************

 * LaCie d2 Network Info

arch/arm/mach-orion5x/board-dt.c

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#include <asm/system_misc.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <mach/orion5x.h>

#include <mach/bridge-regs.h>

#include <plat/irq.h>

#include <plat/time.h>

#include "orion5x.h"

#include "bridge-regs.h"

#include "common.h"



static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = {

arch/arm/mach-orion5x/board-mss2.c

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

#include <mach/orion5x.h>

#include <mach/bridge-regs.h>

#include "orion5x.h"

#include "bridge-regs.h"

#include "common.h"



/*****************************************************************************

arch/arm/mach-orion5x/board-rd88f5182.c

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>

#include <mach/orion5x.h>

#include "common.h"

#include "orion5x.h"



/*****************************************************************************

 * RD-88F5182 Info

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

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

 * arch/arm/mach-orion5x/include/mach/bridge-regs.h

 *

 * Orion CPU Bridge Registers

 *

 * This file is licensed under the terms of the GNU General Public
@@ -11,7 +9,7 @@ 
#ifndef __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)