[ARM] 3817/1: iop3xx: split the iop3xx mach into iop32x and iop33x

[pandora-kernel.git] / include / asm-arm / arch-iop32x / memory.h

diff --git a/include/asm-arm/arch-iop3xx/memory.h b/include/asm-arm/arch-iop32x/memory.h
similarity index 62%
rename from include/asm-arm/arch-iop3xx/memory.h
rename to include/asm-arm/arch-iop32x/memory.h
index 2566618..b4073f1 100644 (file)
--- a/include/asm-arm/arch-iop3xx/memory.h
+++ b/include/asm-arm/arch-iop32x/memory.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-iop3xx/memory.h
+ * linux/include/asm-arm/arch-iop32x/memory.h
  */
 
 #ifndef __ASM_ARCH_MEMORY_H
@@ -10,11 +10,7 @@
 /*
  * Physical DRAM offset.
  */
-#ifndef CONFIG_ARCH_IOP33X
 #define PHYS_OFFSET    UL(0xa0000000)
-#else
-#define PHYS_OFFSET    UL(0x00000000)
-#endif
 
 /*
  * Virtual view <-> PCI DMA view memory address translations
@@ -23,16 +19,9 @@
  * bus_to_virt: Used to convert an address for DMA operations
  *             to an address that the kernel can use.
  */
-#if defined(CONFIG_ARCH_IOP32X)
 
 #define __virt_to_bus(x)       (((__virt_to_phys(x)) & ~(*IOP321_IATVR2)) | ((*IOP321_IABAR2) & 0xfffffff0))
 #define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP321_IALR2)) | ( *IOP321_IATVR2)))
 
-#elif defined(CONFIG_ARCH_IOP33X)
-
-#define __virt_to_bus(x)       (((__virt_to_phys(x)) & ~(*IOP331_IATVR2)) | ((*IOP331_IABAR2) & 0xfffffff0))
-#define __bus_to_virt(x)    (__phys_to_virt(((x) & ~(*IOP331_IALR2)) | ( *IOP331_IATVR2)))
-
-#endif
 
 #endif