Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce07d90a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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



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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f6ff56cd

arch/arm/mach-realview/core.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <asm/leds.h>

#include <asm/io.h>



#define __io_address(n)		__io(IO_ADDRESS(n))



extern struct sys_timer realview_timer;



#define AMBA_DEVICE(name,busid,base,plat)			\

arch/arm/mach-realview/localtimer.c

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <asm/io.h>

#include <asm/irq.h>



#include "core.h"



#define TWD_BASE(cpu)	(__io_address(REALVIEW_TWD_BASE) + \

			 ((cpu) * REALVIEW_TWD_SIZE))

arch/arm/mach-realview/platsmp.c

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

#include <asm/hardware/arm_scu.h>

#include <asm/hardware.h>



#include "core.h"

#include <asm/io.h>



extern void realview_secondary_startup(void);

include/asm-arm/arch-realview/hardware.h

+1 −0
Original line number Diff line number Diff line
@@ -27,5 +27,6 @@ 


/* macro to get at IO space when running virtually */

#define IO_ADDRESS(x)		(((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000)

#define __io_address(n)		__io(IO_ADDRESS(n))



#endif

include/asm-arm/arch-realview/system.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static inline void arch_idle(void) 


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;



	/*