X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=nand_spl%2Fboard%2Famcc%2Fcanyonlands%2Fddr2_fixed.c;h=ce8515d51392ab8108716ac9692cc46cdf90a1b2;hb=326ea986ac150acdc7656d57fca647db80b50158;hp=48708a8eebff2699bb9bad8c09ee964d46a7e66a;hpb=e95bcc3661a78ccc094c365ecd2484d00a60f97d;p=u-boot

diff --git a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c
index 48708a8eeb..ce8515d513 100644
--- a/nand_spl/board/amcc/canyonlands/ddr2_fixed.c
+++ b/nand_spl/board/amcc/canyonlands/ddr2_fixed.c
@@ -1,31 +1,26 @@
 /*
- * (C) Copyright 2008
+ * (C) Copyright 2008-2009
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
+/*
+ * This code can configure those two Crucial SODIMM's:
+ *
+ * Crucial CT6464AC667.4FE - 512MB SO-DIMM (single rank)
+ * Crucial CT6464AC667.8FB - 512MB SO-DIMM (dual rank)
+ *
+ */
+
+#define TEST_ADDR	0x10000000
+#define TEST_MAGIC	0x11223344
+
 static void wait_init_complete(void)
 {
 	u32 val;
@@ -35,12 +30,18 @@ static void wait_init_complete(void)
 	} while (!(val & 0x80000000));
 }
 
-long int initdram(int board_type)
+static void ddr_start(void)
+{
+	mtsdram(SDRAM_MCOPT2, 0x28000000);
+	wait_init_complete();
+}
+
+static void ddr_init_common(void)
 {
 	/*
 	 * Reset the DDR-SDRAM controller.
 	 */
-	mtsdr(SDR0_SRST, (0x80000000 >> 10));
+	mtsdr(SDR0_SRST, SDR0_SRST0_DMC);
 	mtsdr(SDR0_SRST, 0x00000000);
 
 	/*
@@ -49,13 +50,9 @@ long int initdram(int board_type)
 	 * enabled. This will only work for the same memory
 	 * configuration as used here:
 	 *
-	 * Crucial CT3264AC53E.4FD - 256MB SO-DIMM
-	 *
 	 */
 	mtsdram(SDRAM_MCOPT2, 0x00000000);
-	mtsdram(SDRAM_MCOPT1, 0x05122000);
 	mtsdram(SDRAM_MODT0, 0x01000000);
-	mtsdram(SDRAM_CODT, 0x00800021);
 	mtsdram(SDRAM_WRDTR, 0x82000823);
 	mtsdram(SDRAM_CLKTR, 0x40000000);
 	mtsdram(SDRAM_MB0CF, 0x00000201);
@@ -79,18 +76,55 @@ long int initdram(int board_type)
 	mtsdram(SDRAM_INITPLR11, 0x80000432);
 	mtsdram(SDRAM_INITPLR12, 0x808103C0);
 	mtsdram(SDRAM_INITPLR13, 0x80810040);
-	mtsdram(SDRAM_INITPLR14, 0x00000000);
-	mtsdram(SDRAM_INITPLR15, 0x00000000);
+	mtsdram(SDRAM_RDCC, 0x40000000);
+	mtsdram(SDRAM_RQDC, 0x80000038);
+	mtsdram(SDRAM_RFDC, 0x00000257);
 
-	mtsdram(SDRAM_MCOPT2, 0x28000000);
+	mtdcr(SDRAM_R0BAS, 0x0000F800);		/* MQ0_B0BAS */
+}
 
-	wait_init_complete();
+phys_size_t initdram(int board_type)
+{
+	/*
+	 * First try init for this module:
+	 *
+	 * Crucial CT6464AC667.8FB - 512MB SO-DIMM (dual rank)
+	 */
 
-	mtdcr(SDRAM_R0BAS, 0x0000F800);		/* MQ0_B0BAS */
+	ddr_init_common();
 
-	mtsdram(SDRAM_RDCC, 0x40000000);
-	mtsdram(SDRAM_RQDC, 0x80000038);
-	mtsdram(SDRAM_RFDC, 0x00000257);
+	/*
+	 * Crucial CT6464AC667.8FB - 512MB SO-DIMM
+	 */
+	mtdcr(SDRAM_R0BAS, 0x0000F800);
+	mtdcr(SDRAM_R1BAS, 0x0400F800);
+	mtsdram(SDRAM_MCOPT1, 0x05122000);
+	mtsdram(SDRAM_CODT, 0x02800021);
+	mtsdram(SDRAM_MB1CF, 0x00000201);
+
+	ddr_start();
+
+	/*
+	 * Now test if the dual-ranked module is really installed
+	 * by checking an address in the upper 256MByte region
+	 */
+	out_be32((void *)TEST_ADDR, TEST_MAGIC);
+	if (in_be32((void *)TEST_ADDR) != TEST_MAGIC) {
+		/*
+		 * The test failed, so we assume that the single
+		 * ranked module is installed:
+		 *
+		 * Crucial CT6464AC667.4FE - 512MB SO-DIMM (single rank)
+		 */
+
+		ddr_init_common();
+
+		mtdcr(SDRAM_R0BAS, 0x0000F000);
+		mtsdram(SDRAM_MCOPT1, 0x05322000);
+		mtsdram(SDRAM_CODT, 0x00800021);
+
+		ddr_start();
+	}
 
-	return CFG_MBYTES_SDRAM << 20;
+	return CONFIG_SYS_MBYTES_SDRAM << 20;
 }