diff options
| author | Rob Herring | 2012-07-09 05:13:54 +0200 |
|---|---|---|
| committer | Rob Herring | 2012-07-26 16:09:56 +0200 |
| commit | fe5051754263e7198aa8f415b2e1298c126adb4e (patch) | |
| tree | 7c50331d94c244d5f7df21a33c53c964aff2d0c4 /arch/arm/mach-versatile/include | |
| parent | ARM: move PCI i/o resource setup into common code (diff) | |
| download | kernel-qcow2-linux-fe5051754263e7198aa8f415b2e1298c126adb4e.tar.gz kernel-qcow2-linux-fe5051754263e7198aa8f415b2e1298c126adb4e.tar.xz kernel-qcow2-linux-fe5051754263e7198aa8f415b2e1298c126adb4e.zip | |
ARM: versatile: use fixed PCI i/o mapping
Move versatile PCI to fixed i/o mapping and remove io.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-versatile/include')
| -rw-r--r-- | arch/arm/mach-versatile/include/mach/hardware.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/include/mach/io.h | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-versatile/include/mach/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h index 408e58da46c6..3e5d425e2a92 100644 --- a/arch/arm/mach-versatile/include/mach/hardware.h +++ b/arch/arm/mach-versatile/include/mach/hardware.h @@ -29,7 +29,6 @@ */ #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul -#define VERSATILE_PCI_VIRT_MEM_BASE0 (void __iomem *)PCIO_BASE /* macro to get at MMIO space when running virtually */ #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) diff --git a/arch/arm/mach-versatile/include/mach/io.h b/arch/arm/mach-versatile/include/mach/io.h deleted file mode 100644 index 0406513be7d8..000000000000 --- a/arch/arm/mach-versatile/include/mach/io.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * arch/arm/mach-versatile/include/mach/io.h - * - * Copyright (C) 2003 ARM Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __ASM_ARM_ARCH_IO_H -#define __ASM_ARM_ARCH_IO_H - -#define PCIO_BASE 0xeb000000ul - -#define __io(a) ((a) + PCIO_BASE) - -#endif |