Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 255033a9 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b5d5accc

arch/mips/txx9/generic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
obj-y	+= setup.o

obj-$(CONFIG_PCI)	+= pci.o

obj-$(CONFIG_SOC_TX4927)	+= mem_tx4927.o irq_tx4927.o

obj-$(CONFIG_SOC_TX4938)	+= mem_tx4938.o irq_tx4938.o

obj-$(CONFIG_SOC_TX4938)	+= mem_tx4927.o irq_tx4938.o

obj-$(CONFIG_TOSHIBA_FPCIB0)	+= smsc_fdc37m81x.o

obj-$(CONFIG_KGDB)	+= dbgio.o

arch/mips/txx9/generic/mem_tx4927.c

+15 −79
Original line number Diff line number Diff line 
/*

 * linux/arch/mips/tx4927/common/tx4927_prom.c

 * linux/arch/mips/txx9/generic/mem_tx4927.c

 *

 * common tx4927 memory interface

 *
@@ -32,8 +32,9 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/io.h>

#include <asm/txx9/tx4927.h>



static unsigned int __init tx4927_process_sdccr(unsigned long addr)

static unsigned int __init tx4927_process_sdccr(u64 __iomem *addr)

{

	u64 val;

	unsigned int sdccr_ce;
@@ -45,97 +46,32 @@ static unsigned int __init tx4927_process_sdccr(unsigned long addr) 
	unsigned int rs = 0;

	unsigned int cs = 0;

	unsigned int mw = 0;

	unsigned int msize = 0;



	val = __raw_readq((void __iomem *)addr);

	val = __raw_readq(addr);



	/* MVMCP -- need #defs for these bits masks */

	sdccr_ce = ((val & (1 << 10)) >> 10);

	sdccr_bs = ((val & (1 << 8)) >> 8);

	sdccr_rs = ((val & (3 << 5)) >> 5);

	sdccr_cs = ((val & (3 << 2)) >> 2);

	sdccr_cs = ((val & (7 << 2)) >> 2);

	sdccr_mw = ((val & (1 << 0)) >> 0);



	if (sdccr_ce) {

		switch (sdccr_bs) {

		case 0:{

				bs = 2;

				break;

		bs = 2 << sdccr_bs;

		rs = 2048 << sdccr_rs;

		cs = 256 << sdccr_cs;

		mw = 8 >> sdccr_mw;

	}

		case 1:{

				bs = 4;

				break;

			}

		}

		switch (sdccr_rs) {

		case 0:{

				rs = 2048;

				break;

			}

		case 1:{

				rs = 4096;

				break;

			}

		case 2:{

				rs = 8192;

				break;

			}

		case 3:{

				rs = 0;

				break;

			}

		}

		switch (sdccr_cs) {

		case 0:{

				cs = 256;

				break;

			}

		case 1:{

				cs = 512;

				break;

			}

		case 2:{

				cs = 1024;

				break;

			}

		case 3:{

				cs = 2048;

				break;

			}

		}

		switch (sdccr_mw) {

		case 0:{

				mw = 8;

				break;

			}	/* 8 bytes = 64 bits */

		case 1:{

				mw = 4;

				break;

			}	/* 4 bytes = 32 bits */

		}

	}



	/*            bytes per chip     MB per chip      num chips */

	msize = (((rs * cs * mw) / (1024 * 1024)) * bs);



	return (msize);

	return rs * cs * mw * bs;

}





unsigned int __init tx4927_get_mem_size(void)

{

	unsigned int c0;

	unsigned int c1;

	unsigned int c2;

	unsigned int c3;

	unsigned int total;



	/* MVMCP -- need #defs for these registers */

	c0 = tx4927_process_sdccr(0xff1f8000);

	c1 = tx4927_process_sdccr(0xff1f8008);

	c2 = tx4927_process_sdccr(0xff1f8010);

	c3 = tx4927_process_sdccr(0xff1f8018);

	total = c0 + c1 + c2 + c3;

	unsigned int total = 0;

	int i;



	return (total);

	for (i = 0; i < ARRAY_SIZE(tx4927_sdramcptr->cr); i++)

		total += tx4927_process_sdccr(&tx4927_sdramcptr->cr[i]);

	return total;

}

arch/mips/txx9/generic/mem_tx4938.c

deleted100644 → 0
+0 −124
Original line number Diff line number Diff line 
/*

 * linux/arch/mips/tx4938/common/prom.c

 *

 * common tx4938 memory interface

 * Copyright (C) 2000-2001 Toshiba Corporation

 *

 * 2003-2005 (c) MontaVista Software, Inc. This file is licensed under the

 * terms of the GNU General Public License version 2. This program is

 * licensed "as is" without any warranty of any kind, whether express

 * or implied.

 *

 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)

 */



#include <linux/init.h>

#include <linux/types.h>

#include <linux/io.h>



static unsigned int __init

tx4938_process_sdccr(u64 * addr)

{

	u64 val;

	unsigned int sdccr_ce;

	unsigned int sdccr_rs;

	unsigned int sdccr_cs;

	unsigned int sdccr_mw;

	unsigned int rs = 0;

	unsigned int cs = 0;

	unsigned int mw = 0;

	unsigned int bc = 4;

	unsigned int msize = 0;



	val = ____raw_readq((void __iomem *)addr);



	/* MVMCP -- need #defs for these bits masks */

	sdccr_ce = ((val & (1 << 10)) >> 10);

	sdccr_rs = ((val & (3 << 5)) >> 5);

	sdccr_cs = ((val & (7 << 2)) >> 2);

	sdccr_mw = ((val & (1 << 0)) >> 0);



	if (sdccr_ce) {

		switch (sdccr_rs) {

		case 0:{

				rs = 2048;

				break;

			}

		case 1:{

				rs = 4096;

				break;

			}

		case 2:{

				rs = 8192;

				break;

			}

		default:{

				rs = 0;

				break;

			}

		}

		switch (sdccr_cs) {

		case 0:{

				cs = 256;

				break;

			}

		case 1:{

				cs = 512;

				break;

			}

		case 2:{

				cs = 1024;

				break;

			}

		case 3:{

				cs = 2048;

				break;

			}

		case 4:{

				cs = 4096;

				break;

			}

		default:{

				cs = 0;

				break;

			}

		}

		switch (sdccr_mw) {

		case 0:{

				mw = 8;

				break;

			}	/* 8 bytes = 64 bits */

		case 1:{

				mw = 4;

				break;

			}	/* 4 bytes = 32 bits */

		}

	}



	/*           bytes per chip    MB per chip          bank count */

	msize = (((rs * cs * mw) / (1024 * 1024)) * (bc));



	/* MVMCP -- bc hard coded to 4 from table 9.3.1     */

	/*          boad supports bc=2 but no way to detect */



	return (msize);

}



unsigned int __init

tx4938_get_mem_size(void)

{

	unsigned int c0;

	unsigned int c1;

	unsigned int c2;

	unsigned int c3;

	unsigned int total;



	/* MVMCP -- need #defs for these registers */

	c0 = tx4938_process_sdccr((u64 *) 0xff1f8000);

	c1 = tx4938_process_sdccr((u64 *) 0xff1f8008);

	c2 = tx4938_process_sdccr((u64 *) 0xff1f8010);

	c3 = tx4938_process_sdccr((u64 *) 0xff1f8018);

	total = c0 + c1 + c2 + c3;



	return (total);

}

arch/mips/txx9/rbtx4927/prom.c

+1 −5
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ 


void __init rbtx4927_prom_init(void)

{

	extern int tx4927_get_mem_size(void);

	int msize;



	prom_init_cmdline();

	msize = tx4927_get_mem_size();

	add_memory_region(0, msize << 20, BOOT_MEM_RAM);

	add_memory_region(0, tx4927_get_mem_size(), BOOT_MEM_RAM);

}

arch/mips/txx9/rbtx4938/prom.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

}