diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 10:11:40 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 10:11:40 +0100 |
commit | 85e63343f49cdf859bb630ba39d9a9af85dfb3e6 (patch) | |
tree | 8c72184c38d93a34e08f386ae70b4ee12ed7ac20 /arch/arm/mach-orion5x/include/mach/io.h | |
parent | 2f6ae6ef631cd16b0725958ee805a24b9e38d7ad (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
download | blackbird-op-linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.gz blackbird-op-linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.zip |
Merge tag 'v3.5-rc4' into regulator-drivers
Linux 3.5-rc4 contains patches which conflict with some of the
development work.
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach/io.h')
-rw-r--r-- | arch/arm/mach-orion5x/include/mach/io.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/io.h b/arch/arm/mach-orion5x/include/mach/io.h new file mode 100644 index 000000000000..1aa5d0a50a0b --- /dev/null +++ b/arch/arm/mach-orion5x/include/mach/io.h @@ -0,0 +1,22 @@ +/* + * arch/arm/mach-orion5x/include/mach/io.h + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#ifndef __ASM_ARCH_IO_H +#define __ASM_ARCH_IO_H + +#include <mach/orion5x.h> +#include <asm/sizes.h> + +#define IO_SPACE_LIMIT SZ_2M +static inline void __iomem *__io(unsigned long addr) +{ + return (void __iomem *)(addr + ORION5X_PCIE_IO_VIRT_BASE); +} + +#define __io(a) __io(a) +#endif |