[ARM] mm 9: add additional device memory types

Add cached device type for ioremap_cached().  Group all device memory
types together, and ensure that they all have a "MT_DEVICE" prefix.

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

2 files changed, 14 insertions, 14 deletions

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 27b7480f4afe..9cf2498dc99e 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -84,59 +84,59 @@ static struct map_desc ixp2000_io_desc[] __initdata = {
                 .virtual        = IXP2000_CAP_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_CAP_PHYS_BASE),
                 .length         = IXP2000_CAP_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_INTCTL_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_INTCTL_PHYS_BASE),
                 .length         = IXP2000_INTCTL_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_PCI_CREG_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CREG_PHYS_BASE),
                 .length         = IXP2000_PCI_CREG_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_PCI_CSR_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CSR_PHYS_BASE),
                 .length         = IXP2000_PCI_CSR_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_MSF_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_MSF_PHYS_BASE),
                 .length         = IXP2000_MSF_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_SCRATCH_RING_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_SCRATCH_RING_PHYS_BASE),
                 .length         = IXP2000_SCRATCH_RING_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_SRAM0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_SRAM0_PHYS_BASE),
                 .length         = IXP2000_SRAM0_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_PCI_IO_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_IO_PHYS_BASE),
                 .length         = IXP2000_PCI_IO_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_PCI_CFG0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CFG0_PHYS_BASE),
                 .length         = IXP2000_PCI_CFG0_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = IXP2000_PCI_CFG1_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CFG1_PHYS_BASE),
                 .length         = IXP2000_PCI_CFG1_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }
 };
 
 void __init ixp2000_map_io(void)
 {
         /*
-         * On IXP2400 CPUs we need to use MT_IXP2000_DEVICE so that
+         * On IXP2400 CPUs we need to use MT_DEVICE_IXP2000 so that
          * XCB=101 (to avoid triggering erratum #66), and given that
          * this mode speeds up I/O accesses and we have write buffer
          * flushes in the right places anyway, it doesn't hurt to use
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index ac29298c5d3f..500e997ba7a4 100644
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -70,17 +70,17 @@ static struct map_desc enp2611_io_desc[] __initdata = {
                 .virtual        = ENP2611_CALEB_VIRT_BASE,
                 .pfn            = __phys_to_pfn(ENP2611_CALEB_PHYS_BASE),
                 .length         = ENP2611_CALEB_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = ENP2611_PM3386_0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),
                 .length         = ENP2611_PM3386_0_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }, {
                 .virtual        = ENP2611_PM3386_1_VIRT_BASE,
                 .pfn            = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),
                 .length         = ENP2611_PM3386_1_SIZE,
-                .type           = MT_IXP2000_DEVICE,
+                .type           = MT_DEVICE_IXP2000,
         }
 };