Commit 02aa06bc authored by viresh kumar's avatar viresh kumar Committed by Russell King
Browse files

ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h 



This patch makes inclusion of hardware.h and spear.h consistent over all spear
variants. Now we will include hardware.h, wherever we need to use hardware
macros. spear.h will be automatically included by hardware.h

Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 410782be

arch/arm/mach-spear3xx/include/mach/entry-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <asm/hardware/vic.h>

#include <mach/hardware.h>

#include <mach/spear.h>



		.macro	disable_fiq

		.endm

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define __MACH_HARDWARE_H



#include <plat/hardware.h>

#include <mach/spear.h>



/* Vitual to physical translation of statically mapped space */

#define IO_ADDRESS(x)		(x | 0xF0000000)

arch/arm/mach-spear3xx/include/mach/misc_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifndef __MACH_MISC_REGS_H

#define __MACH_MISC_REGS_H



#include <mach/spear.h>

#include <mach/hardware.h>



#define MISC_BASE		IOMEM(VA_SPEAR3XX_ICM3_MISC_REG_BASE)

arch/arm/mach-spear3xx/include/mach/spear.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#ifndef __MACH_SPEAR3XX_H

#define __MACH_SPEAR3XX_H



#include <mach/hardware.h>

#include <mach/spear300.h>

#include <mach/spear310.h>

#include <mach/spear320.h>

arch/arm/mach-spear3xx/spear300.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/irq.h>

#include <plat/shirq.h>

#include <mach/generic.h>

#include <mach/spear.h>

#include <mach/hardware.h>



/* pad multiplexing support */

/* muxing registers */

CRA Git | Maintained and supported by SUSTech CRA and CCSE