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

Commit de60fba2 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge' of... 

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
parents 28853da2 644e28f3

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3375,7 +3375,7 @@ P: Matt Porter 
M:	mporter@kernel.crashing.org

W:	http://www.penguinppc.org/

L:	linuxppc-dev@ozlabs.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git

S:	Maintained



LINUX FOR POWERPC EMBEDDED XILINX VIRTEX

arch/powerpc/boot/4xx.c

+43 −13
Original line number Diff line number Diff line
@@ -158,21 +158,33 @@ void ibm440spe_fixup_memsize(void) 


#define DDR_GET_VAL(val, mask, shift)	(((val) >> (shift)) & (mask))



void ibm4xx_denali_fixup_memsize(void)

/*

 * Some U-Boot versions set the number of chipselects to two

 * for Sequoia/Rainier boards while they only have one chipselect

 * hardwired. Hardcode the number of chipselects to one

 * for sequioa/rainer board models or read the actual value

 * from the memory controller register DDR0_10 otherwise.

 */

static inline u32 ibm4xx_denali_get_cs(void)

{

	u32 val, max_cs, max_col, max_row;

	u32 cs, col, row, bank, dpath;

	unsigned long memsize;

	void *devp;

	char model[64];

	u32 val, cs;



	val = SDRAM0_READ(DDR0_02);

	if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))

		fatal("DDR controller is not initialized\n");

	devp = finddevice("/");

	if (!devp)

		goto read_cs;



	/* get maximum cs col and row values */

	max_cs  = DDR_GET_VAL(val, DDR_MAX_CS_REG, DDR_MAX_CS_REG_SHIFT);

	max_col = DDR_GET_VAL(val, DDR_MAX_COL_REG, DDR_MAX_COL_REG_SHIFT);

	max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);

	if (getprop(devp, "model", model, sizeof(model)) <= 0)

		goto read_cs;



	model[sizeof(model)-1] = 0;



	if (!strcmp(model, "amcc,sequoia") ||

	    !strcmp(model, "amcc,rainier"))

		return 1;



read_cs:

	/* get CS value */

	val = SDRAM0_READ(DDR0_10);
@@ -183,7 +195,25 @@ void ibm4xx_denali_fixup_memsize(void) 
			cs++;

		val = val >> 1;

	}

	return cs;

}



void ibm4xx_denali_fixup_memsize(void)

{

	u32 val, max_cs, max_col, max_row;

	u32 cs, col, row, bank, dpath;

	unsigned long memsize;



	val = SDRAM0_READ(DDR0_02);

	if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))

		fatal("DDR controller is not initialized\n");



	/* get maximum cs col and row values */

	max_cs  = DDR_GET_VAL(val, DDR_MAX_CS_REG, DDR_MAX_CS_REG_SHIFT);

	max_col = DDR_GET_VAL(val, DDR_MAX_COL_REG, DDR_MAX_COL_REG_SHIFT);

	max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);



	cs = ibm4xx_denali_get_cs();

	if (!cs)

		fatal("No memory installed\n");

	if (cs > max_cs)
@@ -193,9 +223,9 @@ void ibm4xx_denali_fixup_memsize(void) 
	val = SDRAM0_READ(DDR0_14);



	if (DDR_GET_VAL(val, DDR_REDUC, DDR_REDUC_SHIFT))

		dpath = 8; /* 64 bits */

	else

		dpath = 4; /* 32 bits */

	else

		dpath = 8; /* 64 bits */



	/* get address pins (rows) */

 	val = SDRAM0_READ(DDR0_42);