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>
22 files changed:
#include <asm/hardware/vic.h>
#include <mach/hardware.h>
#include <asm/hardware/vic.h>
#include <mach/hardware.h>
#define __MACH_HARDWARE_H
#include <plat/hardware.h>
#define __MACH_HARDWARE_H
#include <plat/hardware.h>
/* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000)
/* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000)
#ifndef __MACH_MISC_REGS_H
#define __MACH_MISC_REGS_H
#ifndef __MACH_MISC_REGS_H
#define __MACH_MISC_REGS_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)
#ifndef __MACH_SPEAR3XX_H
#define __MACH_SPEAR3XX_H
#ifndef __MACH_SPEAR3XX_H
#define __MACH_SPEAR3XX_H
-#include <mach/hardware.h>
#include <mach/spear300.h>
#include <mach/spear310.h>
#include <mach/spear320.h>
#include <mach/spear300.h>
#include <mach/spear310.h>
#include <mach/spear320.h>
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* pad multiplexing support */
/* muxing registers */
/* pad multiplexing support */
/* muxing registers */
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* pad multiplexing support */
/* muxing registers */
/* pad multiplexing support */
/* muxing registers */
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
#include <asm/irq.h>
#include <plat/shirq.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* pad multiplexing support */
/* muxing registers */
/* pad multiplexing support */
/* muxing registers */
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <mach/generic.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* Add spear3xx machines common devices here */
/* gpio device registration */
/* Add spear3xx machines common devices here */
/* gpio device registration */
#include <asm/hardware/vic.h>
#include <mach/hardware.h>
#include <asm/hardware/vic.h>
#include <mach/hardware.h>
#define __MACH_HARDWARE_H
#include <plat/hardware.h>
#define __MACH_HARDWARE_H
#include <plat/hardware.h>
/* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000)
/* Vitual to physical translation of statically mapped space */
#define IO_ADDRESS(x) (x | 0xF0000000)
#ifndef __MACH_MISC_REGS_H
#define __MACH_MISC_REGS_H
#ifndef __MACH_MISC_REGS_H
#define __MACH_MISC_REGS_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)
#ifndef __MACH_SPEAR6XX_H
#define __MACH_SPEAR6XX_H
#ifndef __MACH_SPEAR6XX_H
#define __MACH_SPEAR6XX_H
-#include <mach/hardware.h>
#include <mach/spear600.h>
#define SPEAR6XX_ML_SDRAM_BASE 0x00000000
#include <mach/spear600.h>
#define SPEAR6XX_ML_SDRAM_BASE 0x00000000
#include <linux/ptrace.h>
#include <asm/irq.h>
#include <mach/generic.h>
#include <linux/ptrace.h>
#include <asm/irq.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* Add spear600 specific devices here */
/* Add spear600 specific devices here */
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
static struct amba_device *amba_devs[] __initdata = {
&gpio_device[0],
static struct amba_device *amba_devs[] __initdata = {
&gpio_device[0],
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <mach/generic.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <mach/generic.h>
+#include <mach/hardware.h>
/* Add spear6xx machines common devices here */
/* uart device registration */
/* Add spear6xx machines common devices here */
/* uart device registration */
*/
#include <linux/amba/serial.h>
*/
#include <linux/amba/serial.h>
+#include <mach/hardware.h>
.macro addruart, rp, rv
mov \rp, #SPEAR_DBG_UART_BASE @ Physical base
.macro addruart, rp, rv
mov \rp, #SPEAR_DBG_UART_BASE @ Physical base
#include <linux/io.h>
#include <asm/hardware/sp810.h>
#include <linux/io.h>
#include <asm/hardware/sp810.h>
+#include <mach/hardware.h>
static inline void arch_idle(void)
{
static inline void arch_idle(void)
{
#include <linux/io.h>
#include <linux/amba/serial.h>
#include <linux/io.h>
#include <linux/amba/serial.h>
+#include <mach/hardware.h>
#ifndef __PLAT_UNCOMPRESS_H
#define __PLAT_UNCOMPRESS_H
#ifndef __PLAT_UNCOMPRESS_H
#define __PLAT_UNCOMPRESS_H
#include <mach/generic.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#include <mach/generic.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
/*
* We would use TIMER0 and TIMER1 as clockevent and clocksource.
/*
* We would use TIMER0 and TIMER1 as clockevent and clocksource.