1 files changed, 48 insertions, 3 deletions

diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c
index 31848a9592f..47279e1d5eb 100644
--- a/arch/arm/mach-tegra/io.c
+++ b/arch/arm/mach-tegra/io.c
@@ -7,6 +7,8 @@
  *      Colin Cross <ccross@google.com>
  *      Erik Gilling <konkers@google.com>
  *
+ * Copyright (C) 2010-2011 NVIDIA Corporation
+ *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
  * may be copied, distributed, and modified under those terms.
@@ -24,7 +26,7 @@
 #include <linux/mm.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
+#include <mach/iomap.h>
 #include <asm/page.h>
 #include <asm/mach/map.h>
 
@@ -55,6 +57,30 @@ static struct map_desc tegra_io_desc[] __initdata = {
                 .length = IO_IRAM_SIZE,
                 .type = MT_DEVICE,
         },
+        {
+                .virtual = IO_HOST1X_VIRT,
+                .pfn = __phys_to_pfn(IO_HOST1X_PHYS),
+                .length = IO_HOST1X_SIZE,
+                .type = MT_DEVICE,
+        },
+        {
+                .virtual = IO_USB_VIRT,
+                .pfn = __phys_to_pfn(IO_USB_PHYS),
+                .length = IO_USB_SIZE,
+                .type = MT_DEVICE,
+        },
+        {
+                .virtual = IO_SDMMC_VIRT,
+                .pfn = __phys_to_pfn(IO_SDMMC_PHYS),
+                .length = IO_SDMMC_SIZE,
+                .type = MT_DEVICE,
+        },
+        {
+                .virtual = IO_PPCS_VIRT,
+                .pfn = __phys_to_pfn(IO_PPCS_PHYS),
+                .length = IO_PPCS_SIZE,
+                .type = MT_DEVICE,
+        }
 };
 
 void __init tegra_map_common_io(void)
@@ -68,8 +94,27 @@ void __init tegra_map_common_io(void)
 void __iomem *tegra_ioremap(unsigned long p, size_t size, unsigned int type)
 {
         void __iomem *v = IO_ADDRESS(p);
-        if (v == NULL)
-                v = __arm_ioremap(p, size, type);
+
+        /*
+         * __arm_ioremap fails to set the domain of ioremapped memory
+         * correctly, only use it on physical memory.
+         */
+        if (v == NULL) {
+                if ((p >= TEGRA_DRAM_BASE &&
+                     (p + size) <= (TEGRA_DRAM_BASE + TEGRA_DRAM_SIZE)) ||
+                    (p >= TEGRA_NOR_FLASH_BASE &&
+                     (p + size) <= (TEGRA_NOR_FLASH_BASE + TEGRA_NOR_FLASH_SIZE)) ||
+                    (p >= TEGRA_PCIE_BASE &&
+                     (p + size) <= (TEGRA_PCIE_BASE + TEGRA_PCIE_SIZE)))
+                        v = __arm_ioremap(p, size, type);
+        }
+
+        /*
+         * If the physical address was not physical memory or statically
+         * mapped, there's nothing we can do to map it safely.
+         */
+        BUG_ON(v == NULL);
+
         return v;
 }
 EXPORT_SYMBOL(tegra_ioremap);