[ARM] Remove MT_DEVICE_IXP2000 and associated definitions

As of the previous commit, MT_DEVICE_IXP2000 encodes to the same
PTE bit encoding as MT_DEVICE, so it's now redundant.  Convert
MT_DEVICE_IXP2000 to use MT_DEVICE instead, and remove its aliases.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

3 files changed, 9 insertions, 12 deletions

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 71934856fc22..a8094451be57 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -60,10 +60,9 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);
 #define MT_DEVICE               0
 #define MT_DEVICE_NONSHARED     1
 #define MT_DEVICE_CACHED        2
-#define MT_DEVICE_IXP2000       3
-#define MT_DEVICE_WC            4
+#define MT_DEVICE_WC            3
 /*
- * types 5 onwards can be found in asm/mach/map.h and are undefined
+ * types 4 onwards can be found in asm/mach/map.h and are undefined
  * for ioremap
  */
 
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 9eb936e49cc3..72586cd4372e 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -18,16 +18,15 @@ struct map_desc {
         unsigned int type;
 };
 
-/* types 0-4 are defined in asm/io.h */
-#define MT_CACHECLEAN           5
-#define MT_MINICLEAN            6
-#define MT_LOW_VECTORS          7
-#define MT_HIGH_VECTORS         8
-#define MT_MEMORY               9
-#define MT_ROM                  10
+/* types 0-3 are defined in asm/io.h */
+#define MT_CACHECLEAN           4
+#define MT_MINICLEAN            5
+#define MT_LOW_VECTORS          6
+#define MT_HIGH_VECTORS         7
+#define MT_MEMORY               8
+#define MT_ROM                  9
 
 #define MT_NONSHARED_DEVICE     MT_DEVICE_NONSHARED
-#define MT_IXP2000_DEVICE       MT_DEVICE_IXP2000
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index dfeff814a942..e5054b026c24 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -184,7 +184,6 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
 #define L_PTE_MT_WRITEALLOC     (0x07 << 2)     /* 0111 */
 #define L_PTE_MT_DEV_SHARED     (0x04 << 2)     /* 0100 */
 #define L_PTE_MT_DEV_NONSHARED  (0x0c << 2)     /* 1100 */
-#define L_PTE_MT_DEV_IXP2000    (0x0d << 2)     /* 1101 */
 #define L_PTE_MT_DEV_WC         (0x09 << 2)     /* 1001 */
 #define L_PTE_MT_DEV_CACHED     (0x0b << 2)     /* 1011 */
 #define L_PTE_MT_MASK           (0x0f << 2)