ENGR00122651: Add dwc_ahsata support

Add dwc_ahsata support.

Signed-off-by: Terry Lv <r65388@freescale.com>

4 files changed, 25 insertions, 19 deletions

diff --git a/include/asm-arm/arch-mx35/mmu.h b/include/asm-arm/arch-mx35/mmu.h
index 1e9a96f..1b15dba 100644
--- a/include/asm-arm/arch-mx35/mmu.h
+++ b/include/asm-arm/arch-mx35/mmu.h
@@ -136,15 +136,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;
 }
 
 /*
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
diff --git a/include/asm-arm/arch-mx53/mmu.h b/include/asm-arm/arch-mx53/mmu.h
index 5fa2fc0..5063528 100644
--- a/include/asm-arm/arch-mx53/mmu.h
+++ b/include/asm-arm/arch-mx53/mmu.h
@@ -138,12 +138,12 @@ 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 >= 0xB0000000)
-		return (void *)((virt - 0xB0000000) + PHYS_SDRAM_1);
+		return (unsigned long)((virt - 0xB0000000) + PHYS_SDRAM_1);
 
-	return (void *)virt;
+	return (unsigned long)virt;
 }
 
 /*
@@ -154,8 +154,8 @@ void *__ioremap(unsigned long offset, size_t size, unsigned long flags)
 {
 	if (1 == flags) {
 		if (offset >= PHYS_SDRAM_1 &&
-			offset < (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE))
-			return (void *)(offset - PHYS_SDRAM_1) + 0xB0000000;
+		offset < (unsigned long)(PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE))
+			return (void *)((offset - PHYS_SDRAM_1) + 0xB0000000);
 		else
 			return NULL;
 	} else
diff --git a/include/asm-arm/arch-mx53/mx53.h b/include/asm-arm/arch-mx53/mx53.h
index 6586b9c..ea04877 100644
--- a/include/asm-arm/arch-mx53/mx53.h
+++ b/include/asm-arm/arch-mx53/mx53.h
@@ -23,7 +23,12 @@
 #define __REG16(x)      (*((volatile u16 *)(x)))
 #define __REG8(x)       (*((volatile u8 *)(x)))
 
- /*
+/*
+ * SATA
+ */
+#define SATA_BASE_ADDR		0x10000000
+
+/*
  * IRAM
  */
 #define IRAM_BASE_ADDR		0xF8000000	/* internal ram */
@@ -407,6 +412,7 @@ enum mxc_clock {
 	MXC_ESDHC2_CLK,
 	MXC_ESDHC3_CLK,
 	MXC_ESDHC4_CLK,
+	MXC_SATA_CLK
 };
 
 enum mxc_peri_clocks {