[MIPS] TXx9: Cleanups for 64-bit support

* Unify (and fix) mem_tx4938.c and mem_tx4927.c
* Simplify prom_init
* Kill volatiles and unused definitions for tx4927.h and tx4938.h

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 7 insertions, 10 deletions

diff --git a/arch/mips/txx9/rbtx4938/prom.c b/arch/mips/txx9/rbtx4938/prom.c
index fbb37458ddb2..ee189519ce5a 100644
--- a/arch/mips/txx9/rbtx4938/prom.c
+++ b/arch/mips/txx9/rbtx4938/prom.c
@@ -18,12 +18,8 @@
 
 void __init rbtx4938_prom_init(void)
 {
-        extern int tx4938_get_mem_size(void);
-        int msize;
 #ifndef CONFIG_TX4938_NAND_BOOT
         prom_init_cmdline();
 #endif
-
-        msize = tx4938_get_mem_size();
-        add_memory_region(0, msize << 20, BOOT_MEM_RAM);
+        add_memory_region(0, tx4938_get_mem_size(), BOOT_MEM_RAM);
 }
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index c2da92396b7a..c1e076c7b2d2 100644
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -310,7 +310,7 @@ void __init tx4938_board_setup(void)
 
         printk(KERN_INFO "%s SDRAMC --", txx9_pcode_str);
         for (i = 0; i < 4; i++) {
-                unsigned long long cr = tx4938_sdramcptr->cr[i];
+                u64 cr = TX4938_SDRAMC_CR(i);
                 unsigned long ram_base, ram_size;
                 if (!((unsigned long)cr & 0x00000400))
                         continue;       /* disabled */
@@ -318,20 +318,21 @@ void __init tx4938_board_setup(void)
                 ram_size = ((unsigned long)(cr >> 33) + 1) << 21;
                 if (ram_base >= 0x20000000)
                         continue;       /* high memory (ignore) */
-                printk(" CR%d:%016Lx", i, cr);
+                printk(KERN_CONT " CR%d:%016llx", i, cr);
                 tx4938_sdram_resource[i].name = "SDRAM";
                 tx4938_sdram_resource[i].start = ram_base;
                 tx4938_sdram_resource[i].end = ram_base + ram_size - 1;
                 tx4938_sdram_resource[i].flags = IORESOURCE_MEM;
                 request_resource(&iomem_resource, &tx4938_sdram_resource[i]);
         }
-        printk(" TR:%09Lx\n", tx4938_sdramcptr->tr);
+        printk(KERN_CONT " TR:%09llx\n", ____raw_readq(&tx4938_sdramcptr->tr));
 
         /* SRAM */
-        if (tx4938_sramcptr->cr & 1) {
+        if (____raw_readq(&tx4938_sramcptr->cr) & 1) {
                 unsigned int size = 0x800;
                 unsigned long base =
-                        (tx4938_sramcptr->cr >> (39-11)) & ~(size - 1);
+                        (____raw_readq(&tx4938_sramcptr->cr) >> (39-11))
+                        & ~(size - 1);
                 tx4938_sram_resource.name = "SRAM";
                 tx4938_sram_resource.start = base;
                 tx4938_sram_resource.end = base + size - 1;