omap3/4: Remove overlapping mapping of L4_WKUP io space
This patch removes the L4 wakeup io mapping section for omap3 and omap4. L4 wakeup space is part of 4MB L4 space which is already mapped and hence remove the overlapped mapping. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Reviewed-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
737daa0360
commit
8ca4582218
3 changed files with 0 additions and 25 deletions
|
@ -139,12 +139,6 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
|
|||
.length = L4_34XX_SIZE,
|
||||
.type = MT_DEVICE
|
||||
},
|
||||
{
|
||||
.virtual = L4_WK_34XX_VIRT,
|
||||
.pfn = __phys_to_pfn(L4_WK_34XX_PHYS),
|
||||
.length = L4_WK_34XX_SIZE,
|
||||
.type = MT_DEVICE
|
||||
},
|
||||
{
|
||||
.virtual = OMAP34XX_GPMC_VIRT,
|
||||
.pfn = __phys_to_pfn(OMAP34XX_GPMC_PHYS),
|
||||
|
@ -191,12 +185,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
|
|||
.length = L4_44XX_SIZE,
|
||||
.type = MT_DEVICE,
|
||||
},
|
||||
{
|
||||
.virtual = L4_WK_44XX_VIRT,
|
||||
.pfn = __phys_to_pfn(L4_WK_44XX_PHYS),
|
||||
.length = L4_WK_44XX_SIZE,
|
||||
.type = MT_DEVICE,
|
||||
},
|
||||
{
|
||||
.virtual = OMAP44XX_GPMC_VIRT,
|
||||
.pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS),
|
||||
|
|
|
@ -158,10 +158,6 @@
|
|||
* VPOM3430 was not working for Int controller
|
||||
*/
|
||||
|
||||
#define L4_WK_34XX_PHYS L4_WK_34XX_BASE /* 0x48300000 --> 0xfa300000 */
|
||||
#define L4_WK_34XX_VIRT (L4_WK_34XX_PHYS + OMAP2_L4_IO_OFFSET)
|
||||
#define L4_WK_34XX_SIZE SZ_1M
|
||||
|
||||
#define L4_PER_34XX_PHYS L4_PER_34XX_BASE
|
||||
/* 0x49000000 --> 0xfb000000 */
|
||||
#define L4_PER_34XX_VIRT (L4_PER_34XX_PHYS + OMAP2_L4_IO_OFFSET)
|
||||
|
@ -204,11 +200,6 @@
|
|||
#define L4_44XX_VIRT (L4_44XX_PHYS + OMAP2_L4_IO_OFFSET)
|
||||
#define L4_44XX_SIZE SZ_4M
|
||||
|
||||
|
||||
#define L4_WK_44XX_PHYS L4_WK_44XX_BASE /* 0x4a300000 --> 0xfc300000 */
|
||||
#define L4_WK_44XX_VIRT (L4_WK_44XX_PHYS + OMAP2_L4_IO_OFFSET)
|
||||
#define L4_WK_44XX_SIZE SZ_1M
|
||||
|
||||
#define L4_PER_44XX_PHYS L4_PER_44XX_BASE
|
||||
/* 0x48000000 --> 0xfa000000 */
|
||||
#define L4_PER_44XX_VIRT (L4_PER_44XX_PHYS + OMAP2_L4_IO_OFFSET)
|
||||
|
|
|
@ -90,8 +90,6 @@ void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type)
|
|||
return XLATE(p, L3_34XX_PHYS, L3_34XX_VIRT);
|
||||
if (BETWEEN(p, L4_34XX_PHYS, L4_34XX_SIZE))
|
||||
return XLATE(p, L4_34XX_PHYS, L4_34XX_VIRT);
|
||||
if (BETWEEN(p, L4_WK_34XX_PHYS, L4_WK_34XX_SIZE))
|
||||
return XLATE(p, L4_WK_34XX_PHYS, L4_WK_34XX_VIRT);
|
||||
if (BETWEEN(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_SIZE))
|
||||
return XLATE(p, OMAP34XX_GPMC_PHYS, OMAP34XX_GPMC_VIRT);
|
||||
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)
|
|||
return XLATE(p, L3_44XX_PHYS, L3_44XX_VIRT);
|
||||
if (BETWEEN(p, L4_44XX_PHYS, L4_44XX_SIZE))
|
||||
return XLATE(p, L4_44XX_PHYS, L4_44XX_VIRT);
|
||||
if (BETWEEN(p, L4_WK_44XX_PHYS, L4_WK_44XX_SIZE))
|
||||
return XLATE(p, L4_WK_44XX_PHYS, L4_WK_44XX_VIRT);
|
||||
if (BETWEEN(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_SIZE))
|
||||
return XLATE(p, OMAP44XX_GPMC_PHYS, OMAP44XX_GPMC_VIRT);
|
||||
if (BETWEEN(p, OMAP44XX_EMIF1_PHYS, OMAP44XX_EMIF1_SIZE))
|
||||
|
|
Reference in a new issue