powerpc/85xx: Remove DATARATE_*_MHZ defines in static ddr init

PATCH New Kumar Gala 1 participant 4 messages Jan 26, 2011 – Feb 1, 2011 PowerPC

Share & tools

Kumar Gala

author

2011-01-26 06:22 UTC #0 lore raw

PATCH 1/2 powerpc/85xx: Remove DATARATE_*_MHZ defines in static ddr init

Rather than having #defines DATARATE_*_MHZ, lets just match what we do on the SPD code and convert the DDR frequency into MHZ and just compare with a constant.

Based on patch from Poonam Aggrwal.

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/corenet_ds/ddr.c         |   14 ++++++++------
 board/freescale/corenet_ds/p4080ds_ddr.c |   24 +++++++++---------------
 board/freescale/p1_p2_rdb/ddr.c          |   25 +++++++++++--------------
 3 files changed, 28 insertions(+), 35 deletions(-)

board/freescale/corenet_ds/ddr.c +8 -6

index 6660b01..4c30657 100644
@@ -31,19 +31,21 @@ extern fixed_ddr_parm_t fixed_ddr_parm_1[];
 phys_size_t fixed_sdram(void)
 {
 	int i;
-	sys_info_t sysinfo;
 	char buf[32];
 	fsl_ddr_cfg_regs_t ddr_cfg_regs;
 	phys_size_t ddr_size;
 	unsigned int lawbar1_target_id;
+	ulong ddr_freq, ddr_freq_mhz;
+
+	ddr_freq = get_ddr_freq(0);
+	ddr_freq_mhz = ddr_freq / 1000000;
 
-	get_sys_info(&sysinfo);
 	printf("Configuring DDR for %s MT/s data rate\n",
-				strmhz(buf, sysinfo.freqDDRBus));
+				strmhz(buf, ddr_freq));
 
 	for (i = 0; fixed_ddr_parm_0[i].max_freq > 0; i++) {
-		if ((sysinfo.freqDDRBus > fixed_ddr_parm_0[i].min_freq) &&
-		   (sysinfo.freqDDRBus <= fixed_ddr_parm_0[i].max_freq)) {
+		if ((ddr_freq_mhz > fixed_ddr_parm_0[i].min_freq) &&
+		   (ddr_freq_mhz <= fixed_ddr_parm_0[i].max_freq)) {
 			memcpy(&ddr_cfg_regs,
 				fixed_ddr_parm_0[i].ddr_settings,
 				sizeof(ddr_cfg_regs));

@@ -53,7 +55,7 @@ phys_size_t fixed_sdram(void)
 
 	if (fixed_ddr_parm_0[i].max_freq == 0)
 		panic("Unsupported DDR data rate %s MT/s data rate\n",
-			strmhz(buf, sysinfo.freqDDRBus));
+			strmhz(buf, ddr_freq));
 
 	ddr_size = (phys_size_t) CONFIG_SYS_SDRAM_SIZE * 1024 * 1024;
 	ddr_cfg_regs.ddr_cdr1 = DDR_CDR1_DHC_EN;

board/freescale/corenet_ds/p4080ds_ddr.c +9 ~~-15~~

index 4ad89ff..ccb9da8 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2011 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

@@ -9,12 +9,6 @@
 #include <common.h>
 #include <asm/fsl_ddr_sdram.h>
 
-#define DATARATE_800MHZ			800000000
-#define DATARATE_900MHZ			900000000
-#define DATARATE_1000MHZ		1000000000
-#define DATARATE_1200MHZ		1200000000
-#define DATARATE_1300MHZ		1300000000
-
 #define CONFIG_SYS_DDR_TIMING_3_1200	0x01030000
 #define CONFIG_SYS_DDR_TIMING_0_1200	0xCC550104
 #define CONFIG_SYS_DDR_TIMING_1_1200	0x868FAA45

@@ -340,17 +334,17 @@ fsl_ddr_cfg_regs_t ddr_cfg_regs_1200_2nd = {
 };
 
 fixed_ddr_parm_t fixed_ddr_parm_0[] = {
-	{DATARATE_800MHZ, DATARATE_900MHZ, &ddr_cfg_regs_800},
-	{DATARATE_900MHZ, DATARATE_1000MHZ, &ddr_cfg_regs_900},
-	{DATARATE_1000MHZ, DATARATE_1200MHZ, &ddr_cfg_regs_1000},
-	{DATARATE_1200MHZ, DATARATE_1300MHZ, &ddr_cfg_regs_1200},
+	{800, 900, &ddr_cfg_regs_800},
+	{900, 1000, &ddr_cfg_regs_900},
+	{1000, 1200, &ddr_cfg_regs_1000},
+	{1200, 1300, &ddr_cfg_regs_1200},
 	{0, 0, NULL}
 };
 
 fixed_ddr_parm_t fixed_ddr_parm_1[] = {
-	{DATARATE_800MHZ, DATARATE_900MHZ, &ddr_cfg_regs_800_2nd},
-	{DATARATE_900MHZ, DATARATE_1000MHZ, &ddr_cfg_regs_900_2nd},
-	{DATARATE_1000MHZ, DATARATE_1200MHZ, &ddr_cfg_regs_1000_2nd},
-	{DATARATE_1200MHZ, DATARATE_1300MHZ, &ddr_cfg_regs_1200_2nd},
+	{800, 900, &ddr_cfg_regs_800_2nd},
+	{900, 1000, &ddr_cfg_regs_900_2nd},
+	{1000, 1200, &ddr_cfg_regs_1000_2nd},
+	{1200, 1300, &ddr_cfg_regs_1200_2nd},
 	{0, 0, NULL}
 };

board/freescale/p1_p2_rdb/ddr.c +11 ~~-14~~

index e54fde2..fbc46b1 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc.
+ * Copyright 2009, 2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -33,11 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
 extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 				   unsigned int ctrl_num);
 
-#define DATARATE_400MHZ 400000000
-#define DATARATE_533MHZ 533333333
-#define DATARATE_667MHZ 666666666
-#define DATARATE_800MHZ 800000000
-
 #define CONFIG_SYS_DDR_CS0_BNDS		0x0000003F
 #define CONFIG_SYS_DDR_CS0_CONFIG	0x80014202
 #define CONFIG_SYS_DDR_CS0_CONFIG_2	0x00000000

@@ -204,27 +199,29 @@ fsl_ddr_cfg_regs_t ddr_cfg_regs_800 = {
 
 phys_size_t fixed_sdram (void)
 {
-	sys_info_t sysinfo;
 	char buf[32];
 	fsl_ddr_cfg_regs_t ddr_cfg_regs;
 	size_t ddr_size;
 	struct cpu_type *cpu;
+	ulong ddr_freq, ddr_freq_mhz;
+
+	ddr_freq = get_ddr_freq(0);
+	ddr_freq_mhz = ddr_freq / 1000000;
 
-	get_sys_info(&sysinfo);
 	printf("Configuring DDR for %s MT/s data rate\n",
-				strmhz(buf, sysinfo.freqDDRBus));
+				strmhz(buf, ddr_freq));
 
-	if(sysinfo.freqDDRBus <= DATARATE_400MHZ)
+	if(ddr_freq_mhz <= 400)
 		memcpy(&ddr_cfg_regs, &ddr_cfg_regs_400, sizeof(ddr_cfg_regs));
-	else if(sysinfo.freqDDRBus <= DATARATE_533MHZ)
+	else if(ddr_freq_mhz <= 533)
 		memcpy(&ddr_cfg_regs, &ddr_cfg_regs_533, sizeof(ddr_cfg_regs));
-	else if(sysinfo.freqDDRBus <= DATARATE_667MHZ)
+	else if(ddr_freq_mhz <= 667)
 		memcpy(&ddr_cfg_regs, &ddr_cfg_regs_667, sizeof(ddr_cfg_regs));
-	else if(sysinfo.freqDDRBus <= DATARATE_800MHZ)
+	else if(ddr_freq_mhz <= 800)
 		memcpy(&ddr_cfg_regs, &ddr_cfg_regs_800, sizeof(ddr_cfg_regs));
 	else
 		panic("Unsupported DDR data rate %s MT/s data rate\n",
-					strmhz(buf, sysinfo.freqDDRBus));
+					strmhz(buf, ddr_freq));
 
 	cpu = gd->cpu;
 	/* P1020 and it's derivatives support max 32bit DDR width */

Signature · 1 line

1.7.2.3

Kumar Gala

author Applied

2011-02-01 04:43 UTC #1 lore raw

PATCH 1/2 powerpc/85xx: Remove DATARATE_*_MHZ defines in static ddr init

Quoted 4 lines · Kumar Gala

Rather than having #defines DATARATE_*_MHZ, lets just match what we do on the SPD code and convert the DDR frequency into MHZ and just compare with a constant.

Quoted 8 lines

Based on patch from Poonam Aggrwal.

Signed-off-by Kumar Gala <[email protected]>

---

board/freescale/corenet_ds/ddr.c         |   14 ++++++++------
board/freescale/corenet_ds/p4080ds_ddr.c |   24 +++++++++---------------
board/freescale/p1_p2_rdb/ddr.c          |   25 +++++++++++--------------
3 files changed, 28 insertions(+), 35 deletions(-)

applied to 85xx next

- k

Kumar Gala

author

2011-01-26 06:22 UTC #2 lore raw

PATCH 2/2 powerpc/85xx: Declare fsl_ddr_set_memctl_regs in <asm/fsl_ddr_sdram.h>

In reply to Kumar Gala

Remove declerations of fsl_ddr_set_memctl_regs in board files with and place it into a common header.

Based on patch from Poonam Aggrwal.

Signed-off-by Kumar Gala <[email protected]>

---
 arch/powerpc/include/asm/fsl_ddr_sdram.h |    2 ++
 board/freescale/corenet_ds/ddr.c         |    3 ---
 board/freescale/p1_p2_rdb/ddr.c          |    3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

arch/powerpc/include/asm/fsl_ddr_sdram.h +2 -0

index 852e5c3..73bc023 100644
@@ -266,6 +266,8 @@ typedef struct memctl_options_s {
 
 extern phys_size_t fsl_ddr_sdram(void);
 extern int fsl_use_spd(void);
+extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
+					unsigned int ctrl_num);
 
 /*
  * The 85xx boards have a common prototype for fixed_sdram so put the

board/freescale/corenet_ds/ddr.c +0 -3

index 4c30657..fb53946 100644
@@ -16,9 +16,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
-				   unsigned int ctrl_num);
-
 
 /*
  * Fixed sdram init -- doesn't use serial presence detect.

board/freescale/p1_p2_rdb/ddr.c +0 -3

index fbc46b1..44faec3 100644
@@ -30,9 +30,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
-				   unsigned int ctrl_num);
-
 #define CONFIG_SYS_DDR_CS0_BNDS		0x0000003F
 #define CONFIG_SYS_DDR_CS0_CONFIG	0x80014202
 #define CONFIG_SYS_DDR_CS0_CONFIG_2	0x00000000

Signature · 1 line

1.7.2.3

Kumar Gala

author Applied

2011-02-01 04:43 UTC #3 lore raw

PATCH 2/2 powerpc/85xx: Declare fsl_ddr_set_memctl_regs in <asm/fsl_ddr_sdram.h>

Quoted 11 lines · Kumar Gala

Remove declerations of fsl_ddr_set_memctl_regs in board files with and place it into a common header.
Based on patch from Poonam Aggrwal.
Signed-off-by Kumar Gala <[email protected]>
---
arch/powerpc/include/asm/fsl_ddr_sdram.h |    2 ++
board/freescale/corenet_ds/ddr.c         |    3 ---
board/freescale/p1_p2_rdb/ddr.c          |    3 ---
3 files changed, 2 insertions(+), 6 deletions(-)

applied to 85xx next

- k