Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig

3 files changed, 14 insertions, 27 deletions

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index a6a4f93085fd..628063ca31e6 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -84,64 +84,57 @@ 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_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_INTCTL_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_INTCTL_PHYS_BASE),
                 .length         = IXP2000_INTCTL_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_PCI_CREG_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CREG_PHYS_BASE),
                 .length         = IXP2000_PCI_CREG_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_PCI_CSR_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CSR_PHYS_BASE),
                 .length         = IXP2000_PCI_CSR_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_MSF_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_MSF_PHYS_BASE),
                 .length         = IXP2000_MSF_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_SCRATCH_RING_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_SCRATCH_RING_PHYS_BASE),
                 .length         = IXP2000_SCRATCH_RING_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_SRAM0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_SRAM0_PHYS_BASE),
                 .length         = IXP2000_SRAM0_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_PCI_IO_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_IO_PHYS_BASE),
                 .length         = IXP2000_PCI_IO_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_PCI_CFG0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CFG0_PHYS_BASE),
                 .length         = IXP2000_PCI_CFG0_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = IXP2000_PCI_CFG1_VIRT_BASE,
                 .pfn            = __phys_to_pfn(IXP2000_PCI_CFG1_PHYS_BASE),
                 .length         = IXP2000_PCI_CFG1_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }
 };
 
 void __init ixp2000_map_io(void)
 {
-        /*
-         * 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
-         * XCB=101 for all IXP2000s.
-         */
         iotable_init(ixp2000_io_desc, ARRAY_SIZE(ixp2000_io_desc));
 
         /* Set slowport to 8-bit mode.  */
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 279e431e0379..c84dfac13882 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_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = ENP2611_PM3386_0_VIRT_BASE,
                 .pfn            = __phys_to_pfn(ENP2611_PM3386_0_PHYS_BASE),
                 .length         = ENP2611_PM3386_0_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }, {
                 .virtual        = ENP2611_PM3386_1_VIRT_BASE,
                 .pfn            = __phys_to_pfn(ENP2611_PM3386_1_PHYS_BASE),
                 .length         = ENP2611_PM3386_1_SIZE,
-                .type           = MT_DEVICE_IXP2000,
+                .type           = MT_DEVICE,
         }
 };
 
diff --git a/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h
index 19d80379a3e3..822f63f2f4a2 100644
--- a/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h
+++ b/arch/arm/mach-ixp2000/include/mach/ixp2000-regs.h
@@ -41,13 +41,7 @@
  * Most of the registers are clumped in 4K regions spread throughout
  * the 0xc0000000 -> 0xc0100000 address range, but we just map in
  * the whole range using a single 1 MB section instead of small
- * 4K pages.  This has two advantages for us:
- *
- * 1) We use only one TLB entry for large number of on-chip I/O devices.
- *
- * 2) We can easily set the Section attributes to XCB=101 on the IXP2400
- *    as required per erratum #66.  We accomplish this by using a
- *    new MT_IXP2000_DEVICE memory type with the bits set as required.
+ * 4K pages.
  *
  * CAP stands for CSR Access Proxy.
  *