MIPS: malta: Use generic platform_maar_init

The default implementation of platform_maar_init is sufficient for Malta
boards where we want to allow speculation in the regions of memory
corresponding to DDR & disallow it elsewhere. Drop the custom
implementation such that the default is used, reducing the duplication
of information provided by the Malta platform code.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/10677/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index b769657be4d4609f9e4545ac97147ca63000a363..dadeb83791828249e3af6d62ad55f1e9a2756a8a 100644 (file)
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -179,31 +179,6 @@ void __init prom_free_prom_memory(void)
        }
 }
 
-unsigned platform_maar_init(unsigned num_pairs)
-{
-       phys_addr_t mem_end = (physical_memsize & ~0xffffull) - 1;
-       struct maar_config cfg[] = {
-               /* DRAM preceding I/O */
-               { 0x00000000, 0x0fffffff, MIPS_MAAR_S },
-
-               /* DRAM following I/O */
-               { 0x20000000, mem_end, MIPS_MAAR_S },
-
-               /* DRAM alias in upper half of physical */
-               { 0x80000000, 0x80000000 + mem_end, MIPS_MAAR_S },
-       };
-       unsigned i, num_cfg = ARRAY_SIZE(cfg);
-
-       /* If DRAM fits before I/O, drop the region following it */
-       if (physical_memsize <= 0x10000000) {
-               num_cfg--;
-               for (i = 1; i < num_cfg; i++)
-                       cfg[i] = cfg[i + 1];
-       }
-
-       return maar_config(cfg, num_cfg, num_pairs);
-}
-
 phys_addr_t mips_cdmm_phys_base(void)
 {
        /* This address is "typically unused" */