[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>

4 files changed, 3 insertions, 10 deletions

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 685dc1bf0083..06ad914928cf 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -204,13 +204,6 @@ static struct mem_type mem_types[] = {
                 .prot_sect      = PROT_SECT_DEVICE | PMD_SECT_WB,
                 .domain         = DOMAIN_IO,
         },      
-        [MT_DEVICE_IXP2000] = {   /* IXP2400 requires XCB=101 for on-chip I/O */
-                .prot_pte       = PROT_PTE_DEVICE | L_PTE_MT_DEV_IXP2000,
-                .prot_l1        = PMD_TYPE_TABLE,
-                .prot_sect      = PROT_SECT_DEVICE | PMD_SECT_BUFFERABLE |
-                                  PMD_SECT_TEX(1),
-                .domain         = DOMAIN_IO,
-        },
         [MT_DEVICE_WC] = {      /* ioremap_wc */
                 .prot_pte       = PROT_PTE_DEVICE | L_PTE_MT_DEV_WC,
                 .prot_l1        = PMD_TYPE_TABLE,
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 64e593020857..54b1f721dec8 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -119,7 +119,7 @@
         .long   0x00                                            @ unused
         .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_DEV_CACHED
         .long   PTE_EXT_TEX(2)                                  @ L_PTE_MT_DEV_NONSHARED
-        .long   0x00                                            @ L_PTE_MT_DEV_IXP2000
+        .long   0x00                                            @ unused
         .long   0x00                                            @ unused
         .long   0x00                                            @ unused
         .endm
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 22ecef533a84..ecdd944bc2b9 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -360,7 +360,7 @@ cpu_xsc3_mt_table:
         .long   0x00                                            @ unused
         .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_DEV_CACHED
         .long   PTE_EXT_TEX(2)                                  @ L_PTE_MT_DEV_NONSHARED
-        .long   0x00                                            @ L_PTE_MT_DEV_IXP2000 (not present)
+        .long   0x00                                            @ unused
         .long   0x00                                            @ unused
         .long   0x00                                            @ unused
 
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 534b4be86ae5..01adbd9462f8 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -443,7 +443,7 @@ cpu_xscale_mt_table:
         .long   0x00                                            @ unused
         .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_DEV_CACHED
         .long   0x00                                            @ L_PTE_MT_DEV_NONSHARED
-        .long   PTE_EXT_TEX(1) | PTE_BUFFERABLE                 @ L_PTE_MT_DEV_IXP2000
+        .long   0x00                                            @ unused
         .long   0x00                                            @ unused
         .long   0x00                                            @ unused