aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/include/mach/io.h
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2010-09-27 11:26:33 +0200
committerColin Cross <ccross@android.com>2010-10-21 18:13:02 -0700
commit77ffc1465cec32489889d6bc9c288b7b0d2ce9fb (patch)
treebb61f413ebaa2b4923e5af6ea633b112021276c6 /arch/arm/mach-tegra/include/mach/io.h
parent8d685bc5e5cad76c05c9986c23a821c5bcef7c16 (diff)
downloadkernel_samsung_smdk4412-77ffc1465cec32489889d6bc9c288b7b0d2ce9fb.zip
kernel_samsung_smdk4412-77ffc1465cec32489889d6bc9c288b7b0d2ce9fb.tar.gz
kernel_samsung_smdk4412-77ffc1465cec32489889d6bc9c288b7b0d2ce9fb.tar.bz2
tegra: add PCI Express support
Change-Id: Ibd0bcd46895eb88952b9db29e1f68572d39aae01 Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Arnd Bergmann <arnd@arndb.de> CC: Russell King <linux@arm.linux.org.uk> CC: Gary King <GKing@nvidia.com> Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/include/mach/io.h')
-rw-r--r--arch/arm/mach-tegra/include/mach/io.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h
index 16f1618..f0981b1 100644
--- a/arch/arm/mach-tegra/include/mach/io.h
+++ b/arch/arm/mach-tegra/include/mach/io.h
@@ -21,7 +21,7 @@
#ifndef __MACH_TEGRA_IO_H
#define __MACH_TEGRA_IO_H
-#define IO_SPACE_LIMIT 0xffffffff
+#define IO_SPACE_LIMIT 0xffff
/* On TEGRA, many peripherals are very closely packed in
* two 256MB io windows (that actually only use about 64KB
@@ -73,10 +73,20 @@ void tegra_iounmap(volatile void __iomem *addr);
#define IO_ADDRESS(n) ((void __iomem *) IO_TO_VIRT(n))
+#ifdef CONFIG_TEGRA_PCI
+extern void __iomem *tegra_pcie_io_base;
+
+static inline void __iomem *__io(unsigned long addr)
+{
+ return tegra_pcie_io_base + (addr & IO_SPACE_LIMIT);
+}
+#else
static inline void __iomem *__io(unsigned long addr)
{
return (void __iomem *)addr;
}
+#endif
+
#define __io(a) __io(a)
#define __mem_pci(a) (a)