iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
viresh kumar 2011-03-07 05:57:02 +01:00 committed by Russell King
parent 410782beba
commit 02aa06bc49
22 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-spear3xx/include/mach/entry-macro.S
View File

@ -13,7 +13,6 @@
#include <asm/hardware/vic.h> #include <asm/hardware/vic.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/spear.h>
.macro disable_fiq .macro disable_fiq
.endm .endm

1
arch/arm/mach-spear3xx/include/mach/hardware.h
View File

@ -15,6 +15,7 @@
#define __MACH_HARDWARE_H #define __MACH_HARDWARE_H
#include <plat/hardware.h> #include <plat/hardware.h>
#include <mach/spear.h>
/* Vitual to physical translation of statically mapped space */ /* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000) #define IO_ADDRESS(x) (x | 0xF0000000)

2
arch/arm/mach-spear3xx/include/mach/misc_regs.h
View File

@ -14,7 +14,7 @@
#ifndef __MACH_MISC_REGS_H #ifndef __MACH_MISC_REGS_H
#define __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) #define MISC_BASE IOMEM(VA_SPEAR3XX_ICM3_MISC_REG_BASE)

1
arch/arm/mach-spear3xx/include/mach/spear.h
View File

@ -14,7 +14,6 @@
#ifndef __MACH_SPEAR3XX_H #ifndef __MACH_SPEAR3XX_H
#define __MACH_SPEAR3XX_H #define __MACH_SPEAR3XX_H
#include <mach/hardware.h>
#include <mach/spear300.h> #include <mach/spear300.h>
#include <mach/spear310.h> #include <mach/spear310.h>
#include <mach/spear320.h> #include <mach/spear320.h>

2
arch/arm/mach-spear3xx/spear300.c
View File

@ -17,7 +17,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/shirq.h> #include <plat/shirq.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* pad multiplexing support */ /* pad multiplexing support */
/* muxing registers */ /* muxing registers */

2
arch/arm/mach-spear3xx/spear300_evb.c
View File

@ -14,7 +14,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* padmux devices to enable */ /* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = { static struct pmx_dev *pmx_devs[] = {

2
arch/arm/mach-spear3xx/spear310.c
View File

@ -15,7 +15,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/shirq.h> #include <plat/shirq.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* pad multiplexing support */ /* pad multiplexing support */
/* muxing registers */ /* muxing registers */

2
arch/arm/mach-spear3xx/spear310_evb.c
View File

@ -14,7 +14,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* padmux devices to enable */ /* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = { static struct pmx_dev *pmx_devs[] = {

2
arch/arm/mach-spear3xx/spear320.c
View File

@ -15,7 +15,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <plat/shirq.h> #include <plat/shirq.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* pad multiplexing support */ /* pad multiplexing support */
/* muxing registers */ /* muxing registers */

2
arch/arm/mach-spear3xx/spear320_evb.c
View File

@ -14,7 +14,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* padmux devices to enable */ /* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = { static struct pmx_dev *pmx_devs[] = {

2
arch/arm/mach-spear3xx/spear3xx.c
View File

@ -19,7 +19,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* Add spear3xx machines common devices here */ /* Add spear3xx machines common devices here */
/* gpio device registration */ /* gpio device registration */

1
arch/arm/mach-spear6xx/include/mach/entry-macro.S
View File

@ -13,7 +13,6 @@
#include <asm/hardware/vic.h> #include <asm/hardware/vic.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/spear.h>
.macro disable_fiq .macro disable_fiq
.endm .endm

1
arch/arm/mach-spear6xx/include/mach/hardware.h
View File

@ -15,6 +15,7 @@
#define __MACH_HARDWARE_H #define __MACH_HARDWARE_H
#include <plat/hardware.h> #include <plat/hardware.h>
#include <mach/spear.h>
/* Vitual to physical translation of statically mapped space */ /* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000) #define IO_ADDRESS(x) (x | 0xF0000000)

2
arch/arm/mach-spear6xx/include/mach/misc_regs.h
View File

@ -14,7 +14,7 @@
#ifndef __MACH_MISC_REGS_H #ifndef __MACH_MISC_REGS_H
#define __MACH_MISC_REGS_H #define __MACH_MISC_REGS_H
#include <mach/spear.h> #include <mach/hardware.h>
#define MISC_BASE IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE) #define MISC_BASE IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE)

1
arch/arm/mach-spear6xx/include/mach/spear.h
View File

@ -14,7 +14,6 @@
#ifndef __MACH_SPEAR6XX_H #ifndef __MACH_SPEAR6XX_H
#define __MACH_SPEAR6XX_H #define __MACH_SPEAR6XX_H
#include <mach/hardware.h>
#include <mach/spear600.h> #include <mach/spear600.h>
#define SPEAR6XX_ML_SDRAM_BASE 0x00000000 #define SPEAR6XX_ML_SDRAM_BASE 0x00000000

2
arch/arm/mach-spear6xx/spear600.c
View File

@ -14,7 +14,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
/* Add spear600 specific devices here */ /* Add spear600 specific devices here */

2
arch/arm/mach-spear6xx/spear600_evb.c
View File

@ -14,7 +14,7 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/spear.h> #include <mach/hardware.h>
static struct amba_device *amba_devs[] __initdata = { static struct amba_device *amba_devs[] __initdata = {
&gpio_device[0], &gpio_device[0],

2
arch/arm/mach-spear6xx/spear6xx.c
View File

@ -19,8 +19,8 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/hardware.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/spear.h>
/* Add spear6xx machines common devices here */ /* Add spear6xx machines common devices here */
/* uart device registration */ /* uart device registration */

2
arch/arm/plat-spear/include/plat/debug-macro.S
View File

@ -12,7 +12,7 @@
*/ */
#include <linux/amba/serial.h> #include <linux/amba/serial.h>
#include <mach/spear.h> #include <mach/hardware.h>
.macro addruart, rp, rv .macro addruart, rp, rv
mov \rp, #SPEAR_DBG_UART_BASE @ Physical base mov \rp, #SPEAR_DBG_UART_BASE @ Physical base

2
arch/arm/plat-spear/include/plat/system.h
View File

@ -16,7 +16,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <asm/hardware/sp810.h> #include <asm/hardware/sp810.h>
#include <mach/spear.h> #include <mach/hardware.h>
static inline void arch_idle(void) static inline void arch_idle(void)
{ {

2
arch/arm/plat-spear/include/plat/uncompress.h
View File

@ -13,7 +13,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/amba/serial.h> #include <linux/amba/serial.h>
#include <mach/spear.h> #include <mach/hardware.h>
#ifndef __PLAT_UNCOMPRESS_H #ifndef __PLAT_UNCOMPRESS_H
#define __PLAT_UNCOMPRESS_H #define __PLAT_UNCOMPRESS_H

1
arch/arm/plat-spear/time.c
View File

@ -23,7 +23,6 @@
#include <mach/generic.h> #include <mach/generic.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/spear.h>
/* /*
* We would use TIMER0 and TIMER1 as clockevent and clocksource. * We would use TIMER0 and TIMER1 as clockevent and clocksource.