revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-tegra / include / mach / io.h

diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h
index 9a7f8b93ea10d0646d725c8552fa25b1ae551f42..35edfc32ffc9d96280f43f47da841d63ff0fdc32 100644 (file)
--- a/arch/arm/mach-tegra/include/mach/io.h
+++ b/arch/arm/mach-tegra/include/mach/io.h
@@ -33,13 +33,9 @@
  *
  */
 
-#define IO_IRAM_PHYS   0x40000000
-#define IO_IRAM_VIRT   0xFE400000
-#define IO_IRAM_SIZE   SZ_256K
-
-#define IO_CPU_PHYS     0x50000000
+#define IO_CPU_PHYS     0x50040000
 #define IO_CPU_VIRT     0xFE000000
-#define IO_CPU_SIZE    SZ_1M
+#define IO_CPU_SIZE    SZ_16K
 
 #define IO_PPSB_PHYS   0x60000000
 #define IO_PPSB_VIRT   0xFE200000
@@ -49,18 +45,6 @@
 #define IO_APB_VIRT    0xFE300000
 #define IO_APB_SIZE    SZ_1M
 
-#define IO_USB_PHYS    0xC5000000
-#define IO_USB_VIRT    0xFE500000
-#define IO_USB_SIZE    SZ_1M
-
-#define IO_SDMMC_PHYS  0xC8000000
-#define IO_SDMMC_VIRT  0xFE600000
-#define IO_SDMMC_SIZE  SZ_1M
-
-#define IO_HOST1X_PHYS 0x54000000
-#define IO_HOST1X_VIRT 0xFE700000
-#define IO_HOST1X_SIZE SZ_4M
-
 #define IO_TO_VIRT_BETWEEN(p, st, sz)  ((p) >= (st) && (p) < ((st) + (sz)))
 #define IO_TO_VIRT_XLATE(p, pst, vst)  (((p) - (pst) + (vst)))
 
@@ -71,14 +55,6 @@
                IO_TO_VIRT_XLATE((n), IO_APB_PHYS, IO_APB_VIRT) :       \
        IO_TO_VIRT_BETWEEN((n), IO_CPU_PHYS, IO_CPU_SIZE) ?             \
                IO_TO_VIRT_XLATE((n), IO_CPU_PHYS, IO_CPU_VIRT) :       \
-       IO_TO_VIRT_BETWEEN((n), IO_IRAM_PHYS, IO_IRAM_SIZE) ?           \
-               IO_TO_VIRT_XLATE((n), IO_IRAM_PHYS, IO_IRAM_VIRT) :     \
-       IO_TO_VIRT_BETWEEN((n), IO_HOST1X_PHYS, IO_HOST1X_SIZE) ?               \
-               IO_TO_VIRT_XLATE((n), IO_HOST1X_PHYS, IO_HOST1X_VIRT) : \
-       IO_TO_VIRT_BETWEEN((n), IO_USB_PHYS, IO_USB_SIZE) ?             \
-               IO_TO_VIRT_XLATE((n), IO_USB_PHYS, IO_USB_VIRT) :       \
-       IO_TO_VIRT_BETWEEN((n), IO_SDMMC_PHYS, IO_SDMMC_SIZE) ?         \
-               IO_TO_VIRT_XLATE((n), IO_SDMMC_PHYS, IO_SDMMC_VIRT) :   \
        0)
 
 #ifndef __ASSEMBLER__