diff options
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 12 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 9 | ||||
| -rw-r--r-- | arch/arm/plat-omap/io.c | 4 |
3 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 5a3d6f9107e4..0385a284125a 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -140,12 +140,6 @@ static struct map_desc omap34xx_io_desc[] __initdata = { | |||
| 140 | .type = MT_DEVICE | 140 | .type = MT_DEVICE |
| 141 | }, | 141 | }, |
| 142 | { | 142 | { |
| 143 | .virtual = L4_WK_34XX_VIRT, | ||
| 144 | .pfn = __phys_to_pfn(L4_WK_34XX_PHYS), | ||
| 145 | .length = L4_WK_34XX_SIZE, | ||
| 146 | .type = MT_DEVICE | ||
| 147 | }, | ||
| 148 | { | ||
| 149 | .virtual = OMAP34XX_GPMC_VIRT, | 143 | .virtual = OMAP34XX_GPMC_VIRT, |
| 150 | .pfn = __phys_to_pfn(OMAP34XX_GPMC_PHYS), | 144 | .pfn = __phys_to_pfn(OMAP34XX_GPMC_PHYS), |
| 151 | .length = OMAP34XX_GPMC_SIZE, | 145 | .length = OMAP34XX_GPMC_SIZE, |
| @@ -192,12 +186,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = { | |||
| 192 | .type = MT_DEVICE, | 186 | .type = MT_DEVICE, |
| 193 | }, | 187 | }, |
| 194 | { | 188 | { |
| 195 | .virtual = L4_WK_44XX_VIRT, | ||
| 196 | .pfn = __phys_to_pfn(L4_WK_44XX_PHYS), | ||
| 197 | .length = L4_WK_44XX_SIZE, | ||
| 198 | .type = MT_DEVICE, | ||
| 199 | }, | ||
| 200 | { | ||
| 201 | .virtual = OMAP44XX_GPMC_VIRT, | 189 | .virtual = OMAP44XX_GPMC_VIRT, |
| 202 | .pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS), | 190 | .pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS), |
| 203 | .length = OMAP44XX_GPMC_SIZE, | 191 | .length = OMAP44XX_GPMC_SIZE, |
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index eef914d53971..128b549c2796 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h | |||
| @@ -158,10 +158,6 @@ | |||
| 158 | * VPOM3430 was not working for Int controller | 158 | * VPOM3430 was not working for Int controller |
| 159 | */ | 159 | */ |
| 160 | 160 | ||
| 161 | #define L4_WK_34XX_PHYS L4_WK_34XX_BASE /* 0x48300000 --> 0xfa300000 */ | ||
| 162 | #define L4_WK_34XX_VIRT (L4_WK_34XX_PHYS + OMAP2_L4_IO_OFFSET) | ||
| 163 | #define L4_WK_34XX_SIZE SZ_1M | ||
| 164 | |||
| 165 | #define L4_PER_34XX_PHYS L4_PER_34XX_BASE | 161 | #define L4_PER_34XX_PHYS L4_PER_34XX_BASE |
| 166 | /* 0x49000000 --> 0xfb000000 */ | 162 | /* 0x49000000 --> 0xfb000000 */ |
| 167 | #define L4_PER_34XX_VIRT (L4_PER_34XX_PHYS + OMAP2_L4_IO_OFFSET) | 163 | #define L4_PER_34XX_VIRT (L4_PER_34XX_PHYS + OMAP2_L4_IO_OFFSET) |
| @@ -204,11 +200,6 @@ | |||
| 204 | #define L4_44XX_VIRT (L4_44XX_PHYS + OMAP2_L4_IO_OFFSET) | 200 | #define L4_44XX_VIRT (L4_44XX_PHYS + OMAP2_L4_IO_OFFSET) |
| 205 | #define L4_44XX_SIZE SZ_4M | 201 | #define L4_44XX_SIZE SZ_4M |
| 206 | 202 | ||
| 207 | |||
| 208 | #define L4_WK_44XX_PHYS L4_WK_44XX_BASE /* 0x4a300000 --> 0xfc300000 */ | ||
| 209 | #define L4_WK_44XX_VIRT (L4_WK_44XX_PHYS + OMAP2_L4_IO_OFFSET) | ||
| 210 | #define L4_WK_44XX_SIZE SZ_1M | ||
| 211 | |||
| 212 | #define L4_PER_44XX_PHYS L4_PER_44XX_BASE | 203 | #define L4_PER_44XX_PHYS L4_PER_44XX_BASE |
| 213 | /* 0x48000000 --> 0xfa000000 */ | 204 | /* 0x48000000 --> 0xfa000000 */ |
| 214 | #define L4_PER_44XX_VIRT (L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET) | 205 | #define L4_PER_44XX_VIRT (L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET) |
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c index 0cfd54f519c4..2c494cf8e378 100644 --- a/arch/arm/plat-omap/io.c +++ b/arch/arm/plat-omap/io.c | |||
| @@ -90,8 +90,6 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) | |||
| 90 | return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT); | 90 | return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT); |
| 91 | if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE)) | 91 | if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE)) |
| 92 | return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT); | 92 | return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT); |
| 93 | if (BETWEEN(p, L4_WK_34XX_PHYS, L4_WK_34XX_SIZE)) | ||
| 94 | return XLATE(p, L4_WK_34XX_PHYS, L4_WK_34XX_VIRT); | ||
| 95 | if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE)) | 93 | if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE)) |
| 96 | return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT); | 94 | return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT); |
| 97 | if (BETWEEN(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_SIZE)) | 95 | if (BETWEEN(p, OMAP343X_SMS_PHYS, OMAP343X_SMS_SIZE)) |
| @@ -110,8 +108,6 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) | |||
| 110 | return XLATE(p, L3_44XX_PHYS, L3_44XX_VIRT); | 108 | return XLATE(p, L3_44XX_PHYS, L3_44XX_VIRT); |
| 111 | if (BETWEEN(p, L4_44XX_PHYS, L4_44XX_SIZE)) | 109 | if (BETWEEN(p, L4_44XX_PHYS, L4_44XX_SIZE)) |
| 112 | return XLATE(p, L4_44XX_PHYS, L4_44XX_VIRT); | 110 | return XLATE(p, L4_44XX_PHYS, L4_44XX_VIRT); |
| 113 | if (BETWEEN(p, L4_WK_44XX_PHYS, L4_WK_44XX_SIZE)) | ||
| 114 | return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT); | ||
| 115 | if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE)) | 111 | if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE)) |
| 116 | return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT); | 112 | return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT); |
| 117 | if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE)) | 113 | if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE)) |
