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

Commit 8a52dd4f authored by Rob Herring's avatar Rob Herring
Browse files

ARM: orion5x: clean-up mach/io.h 



Move orion5x specific mach/io.h parts into common.h.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
parent 9675b884

arch/arm/mach-orion5x/common.h

+9 −0
Original line number Diff line number Diff line
@@ -57,5 +57,14 @@ struct meminfo; 
struct tag;

extern void __init tag_fixup_mem32(struct tag *, char **, struct meminfo *);



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

 * Helpers to access Orion registers

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

/*

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

 * care of by the caller.

 */

#define orion5x_setbits(r, mask)	writel(readl(r) | (mask), (r))

#define orion5x_clrbits(r, mask)	writel(readl(r) & ~(mask), (r))



#endif

arch/arm/mach-orion5x/include/mach/io.h

+0 −12
Original line number Diff line number Diff line
@@ -18,16 +18,4 @@ 
#define __io(a)			__typesafe_io(a)

#define __mem_pci(a)		(a)





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

 * Helpers to access Orion registers

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

/*

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

 * care of by the caller.

 */

#define orion5x_setbits(r, mask)	writel(readl(r) | (mask), (r))

#define orion5x_clrbits(r, mask)	writel(readl(r) & ~(mask), (r))





#endif

arch/arm/mach-orion5x/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/mach/pci.h>

#include <plat/pcie.h>

#include <plat/addr-map.h>

#include <mach/orion5x.h>

#include "common.h"



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

arch/arm/mach-orion5x/tsx09-common.c

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

#include <linux/timex.h>

#include <linux/serial_reg.h>

#include <mach/orion5x.h>

#include "tsx09-common.h"

#include "common.h"