diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-10 18:29:09 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-06 21:34:40 -0600 |
| commit | 8a52dd4f94abe147bbd4080664817a389c8b6818 (patch) | |
| tree | ea1410f98400ba20dca0224aaf891f0cf823a06c | |
| parent | 9675b8840f4059ddd473956320101e80129115ab (diff) | |
| download | linux-stable-8a52dd4f94abe147bbd4080664817a389c8b6818.tar.gz linux-stable-8a52dd4f94abe147bbd4080664817a389c8b6818.tar.bz2 linux-stable-8a52dd4f94abe147bbd4080664817a389c8b6818.zip | |
ARM: orion5x: clean-up mach/io.h
Move orion5x specific mach/io.h parts into common.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
| -rw-r--r-- | arch/arm/mach-orion5x/common.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/io.h | 12 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/tsx09-common.c | 1 |
4 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index d2513ac79ff5..2e6454c8d4ba 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h @@ -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 diff --git a/arch/arm/mach-orion5x/include/mach/io.h b/arch/arm/mach-orion5x/include/mach/io.h index e9d9afdc2659..444136d8c444 100644 --- a/arch/arm/mach-orion5x/include/mach/io.h +++ b/arch/arm/mach-orion5x/include/mach/io.h @@ -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 diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 09a045f0c406..a9d21510c974 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -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" /***************************************************************************** diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c index c9abb8fbfa70..7189827d641d 100644 --- a/arch/arm/mach-orion5x/tsx09-common.c +++ b/arch/arm/mach-orion5x/tsx09-common.c @@ -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" |