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

[ARM] Fix arch-realview/system.h to use __io_address()

Browse Source 
Move __io_address to arch-realview/hardware.h, drop core.h from platsmp.c
and localtimer.c, and include asm/io.h where required.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-11-16 14:38:19 +00:00 committed by Russell King
parent f6ff56cd56
commit ce07d90aa8
5 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-realview/core.h
View File

@ -26,8 +26,6 @@
#include <asm/leds.h> #include <asm/leds.h>
#include <asm/io.h> #include <asm/io.h>
#define __io_address(n) __io(IO_ADDRESS(n))
extern struct sys_timer realview_timer; extern struct sys_timer realview_timer;
#define AMBA_DEVICE(name,busid,base,plat) \ #define AMBA_DEVICE(name,busid,base,plat) \

2
arch/arm/mach-realview/localtimer.c
View File

@ -21,8 +21,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include "core.h"
#define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \ #define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \
((cpu) * REALVIEW_TWD_SIZE)) ((cpu) * REALVIEW_TWD_SIZE))

3
arch/arm/mach-realview/platsmp.c
View File

@ -17,8 +17,7 @@
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/hardware/arm_scu.h> #include <asm/hardware/arm_scu.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/io.h>
#include "core.h"
extern void realview_secondary_startup(void); extern void realview_secondary_startup(void);

1
include/asm-arm/arch-realview/hardware.h
View File

@ -27,5 +27,6 @@
/* macro to get at IO space when running virtually */ /* macro to get at IO space when running virtually */
#define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)
#define __io_address(n) __io(IO_ADDRESS(n))
#endif #endif

2
include/asm-arm/arch-realview/system.h
View File

@ -36,7 +36,7 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode) static inline void arch_reset(char mode)
{ {
unsigned int hdr_ctrl = (IO_ADDRESS(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET); void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET;
unsigned int val; unsigned int val;
/* /*