Commit ce78179e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: dove: 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.

Link: https://lore.kernel.org/r/20190731195713.3150463-13-arnd@arndb.de


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a3950da1

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

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

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

 *

 * Mbus-L to Mbus 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/dove.h>

#include "dove.h"



#define CPU_CONFIG		(BRIDGE_VIRT_BASE + 0x0000)

arch/arm/mach-dove/cm-a510.c

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

#include <asm/mach/arch.h>



#include <mach/dove.h>



#include "dove.h"

#include "common.h"



static struct mv643xx_eth_platform_data cm_a510_ge00_data = {

arch/arm/mach-dove/common.c

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <mach/bridge-regs.h>

#include <mach/pm.h>

#include <plat/common.h>

#include <plat/irq.h>

#include <plat/time.h>

#include "bridge-regs.h"

#include "pm.h"

#include "common.h"



/* These can go away once Dove uses the mvebu-mbus DT binding */

arch/arm/mach-dove/dove-db-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/gpio.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <mach/dove.h>

#include "dove.h"

#include "common.h"



static struct mv643xx_eth_platform_data dove_db_ge00_data = {

arch/arm/mach-dove/include/mach/dove.h→arch/arm/mach-dove/dove.h

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

 * arch/arm/mach-dove/include/mach/dove.h

 *

 * Generic definitions for Marvell Dove 88AP510 SoC

 *

 * This file is licensed under the terms of the GNU General Public
@@ -11,7 +9,7 @@ 
#ifndef __ASM_ARCH_DOVE_H

#define __ASM_ARCH_DOVE_H



#include <mach/irqs.h>

#include "irqs.h"



/*

 * Marvell Dove address maps.

CRA Git | Maintained and supported by SUSTech CRA and CCSE