diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/hardware.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 26bb1bab4aeb..67d3e2bed065 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h | |||
@@ -86,15 +86,6 @@ | |||
86 | * SPBA0 0x70000000+0x100000 -> 0xf5400000+0x100000 | 86 | * SPBA0 0x70000000+0x100000 -> 0xf5400000+0x100000 |
87 | * AIPS1 0x73f00000+0x100000 -> 0xf5700000+0x100000 | 87 | * AIPS1 0x73f00000+0x100000 -> 0xf5700000+0x100000 |
88 | * AIPS2 0x83f00000+0x100000 -> 0xf4300000+0x100000 | 88 | * AIPS2 0x83f00000+0x100000 -> 0xf4300000+0x100000 |
89 | * mxc91231: | ||
90 | * L2CC 0x30000000+0x010000 -> 0xf4400000+0x010000 | ||
91 | * X_MEMC 0xb8000000+0x010000 -> 0xf4c00000+0x010000 | ||
92 | * ROMP 0x60000000+0x010000 -> 0xf5000000+0x010000 | ||
93 | * AVIC 0x68000000+0x010000 -> 0xf5800000+0x010000 | ||
94 | * AIPS1 0x43f00000+0x100000 -> 0xf5300000+0x100000 | ||
95 | * SPBA0 0x50000000+0x100000 -> 0xf5400000+0x100000 | ||
96 | * SPBA1 0x52000000+0x100000 -> 0xf5600000+0x100000 | ||
97 | * AIPS2 0x53f00000+0x100000 -> 0xf5700000+0x100000 | ||
98 | */ | 89 | */ |
99 | #define IMX_IO_P2V(x) ( \ | 90 | #define IMX_IO_P2V(x) ( \ |
100 | 0xf4000000 + \ | 91 | 0xf4000000 + \ |
@@ -104,6 +95,8 @@ | |||
104 | 95 | ||
105 | #define IMX_IO_ADDRESS(x) IOMEM(IMX_IO_P2V(x)) | 96 | #define IMX_IO_ADDRESS(x) IOMEM(IMX_IO_P2V(x)) |
106 | 97 | ||
98 | #include <mach/mxc.h> | ||
99 | |||
107 | #ifdef CONFIG_ARCH_MX5 | 100 | #ifdef CONFIG_ARCH_MX5 |
108 | #include <mach/mx50.h> | 101 | #include <mach/mx50.h> |
109 | #include <mach/mx51.h> | 102 | #include <mach/mx51.h> |
@@ -134,12 +127,6 @@ | |||
134 | # include <mach/mx25.h> | 127 | # include <mach/mx25.h> |
135 | #endif | 128 | #endif |
136 | 129 | ||
137 | #ifdef CONFIG_ARCH_MXC91231 | ||
138 | # include <mach/mxc91231.h> | ||
139 | #endif | ||
140 | |||
141 | #include <mach/mxc.h> | ||
142 | |||
143 | #define imx_map_entry(soc, name, _type) { \ | 130 | #define imx_map_entry(soc, name, _type) { \ |
144 | .virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \ | 131 | .virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \ |
145 | .pfn = __phys_to_pfn(soc ## _ ## name ## _BASE_ADDR), \ | 132 | .pfn = __phys_to_pfn(soc ## _ ## name ## _BASE_ADDR), \ |