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

Commit b590bc5c authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

Orion: move I/O macros out of orion.h 



Move the Orion register accessor macros out of orion.h, to prevent
them from ending up in the decompressor image (Orion uncompress.h
includes orion.h.)  Move them into io.h, which seems a better place
for this kind of stuff.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent da14d88e

arch/arm/mach-orion/addr-map.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/mbus.h>

#include <asm/hardware.h>

#include <asm/io.h>

#include "common.h"



/*

arch/arm/mach-orion/gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/spinlock.h>

#include <linux/bitops.h>

#include <asm/gpio.h>

#include <asm/io.h>

#include <asm/arch/orion.h>

#include "common.h"

arch/arm/mach-orion/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <asm/gpio.h>

#include <asm/io.h>

#include <asm/arch/orion.h>

#include <asm/plat-orion/irq.h>

#include "common.h"

include/asm-arm/arch-orion/io.h

+15 −0
Original line number Diff line number Diff line
@@ -24,4 +24,19 @@ static inline void __iomem *__io(unsigned long addr) 
#define __io(a)			__io(a)

#define __mem_pci(a)		(a)





/*****************************************************************************

 * Helpers to access Orion registers

 ****************************************************************************/

#define orion_read(r)		__raw_readl(r)

#define orion_write(r, val)	__raw_writel(val, r)



/*

 * These are not preempt-safe.  Locks, if needed, must be taken

 * care of by the caller.

 */

#define orion_setbits(r, mask)	orion_write((r), orion_read(r) | (mask))

#define orion_clrbits(r, mask)	orion_write((r), orion_read(r) & ~(mask))





#endif

include/asm-arm/arch-orion/orion.h

+1 −19
Original line number Diff line number Diff line
@@ -156,23 +156,5 @@ 


#define TIMER_VIRT_BASE		(ORION_BRIDGE_VIRT_BASE | 0x300)



#ifndef __ASSEMBLY__



/*******************************************************************************

 * Helpers to access Orion registers

 ******************************************************************************/

#include <asm/types.h>

#include <asm/io.h>



#define orion_read(r)		__raw_readl(r)

#define orion_write(r, val)	__raw_writel(val, r)



/*

 * These are not preempt safe. Locks, if needed, must be taken care by caller.

 */

#define orion_setbits(r, mask)	orion_write((r), orion_read(r) | (mask))

#define orion_clrbits(r, mask)	orion_write((r), orion_read(r) & ~(mask))



#endif /* __ASSEMBLY__ */



#endif /* __ASM_ARCH_ORION_H__ */
 
#endif