summaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-mx51/mmu.h
diff options
context:
space:
mode:
authorTerry Lv <r65388@freescale.com>2010-05-12 22:49:24 +0800
committerTerry Lv <r65388@freescale.com>2010-06-24 16:54:31 +0800
commit90bfe6af18c84a7e3ba424cba0c2602d883bd286 (patch)
tree815e35b0cefc847806cef9a8df09bdad1c3955ad /include/asm-arm/arch-mx51/mmu.h
parent6fa1a0ea0c589b327e8106d13ffff115d2553284 (diff)
downloadu-boot-imx-90bfe6af18c84a7e3ba424cba0c2602d883bd286.zip
u-boot-imx-90bfe6af18c84a7e3ba424cba0c2602d883bd286.tar.gz
u-boot-imx-90bfe6af18c84a7e3ba424cba0c2602d883bd286.tar.bz2
ENGR00122651: Add dwc_ahsata support
Add dwc_ahsata support. Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'include/asm-arm/arch-mx51/mmu.h')
-rw-r--r--include/asm-arm/arch-mx51/mmu.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-arm/arch-mx51/mmu.h b/include/asm-arm/arch-mx51/mmu.h
index e80cfc9..1c58977 100644
--- a/include/asm-arm/arch-mx51/mmu.h
+++ b/include/asm-arm/arch-mx51/mmu.h
@@ -140,15 +140,15 @@ union ARM_MMU_FIRST_LEVEL_DESCRIPTOR {
* Translate the virtual address of ram space to physical address
* It is dependent on the implementation of mmu_init
*/
-inline void *iomem_to_phys(unsigned long virt)
+inline unsigned long iomem_to_phys(unsigned long virt)
{
if (virt < 0x08000000)
- return (void *)(virt | PHYS_SDRAM_1);
+ return (unsigned long)(virt | PHYS_SDRAM_1);
if ((virt & 0xF0000000) == PHYS_SDRAM_1)
- return (void *)(virt & (~0x08000000));
+ return (unsigned long)(virt & (~0x08000000));
- return (void *)virt;
+ return (unsigned long)virt;
}
/*
@@ -174,15 +174,15 @@ void *__ioremap(unsigned long offset, size_t size, unsigned long flags)
* Translate the virtual address of ram space to physical address
* It is dependent on the implementation of mmu_init
*/
-inline void *iomem_to_phys(unsigned long virt)
+inline unsigned long iomem_to_phys(unsigned long virt)
{
if (virt < (PHYS_SDRAM_1_SIZE - 0x100000))
- return (void *)(virt + PHYS_SDRAM_1);
+ return (unsigned long)(virt + PHYS_SDRAM_1);
if (virt >= 0xE0000000)
- return (void *)((virt - 0xE0000000) + PHYS_SDRAM_1);
+ return (unsigned long)((virt - 0xE0000000) + PHYS_SDRAM_1);
- return (void *)virt;
+ return (unsigned long)virt;
}
/*
@@ -201,7 +201,7 @@ void *__ioremap(unsigned long offset, size_t size, unsigned long flags)
meory space which is mapped to SDRAM */
if (offset >= PHYS_SDRAM_1 &&
offset < (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE))
- return (void *)(offset - PHYS_SDRAM_1) + 0xE0000000;
+ return (void *)((offset - PHYS_SDRAM_1) + 0xE0000000);
else
return NULL;
} else