Patchwork [U-Boot,3/5] powerpc/85xx: Rename MPC8572 DDR erratum to DDR115

login
register
mail settings
Submitter Kumar Gala
Date Jan. 26, 2011, 6:22 a.m.
Message ID <1296022938-19899-3-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/80450/
State Accepted
Commit eb0aff77c83f70a01dfe47d72b08467c157f7a8b
Delegated to: Kumar Gala
Headers show

Comments

Kumar Gala - Jan. 26, 2011, 6:22 a.m.
From: York Sun <yorksun@freescale.com>

Use unique erratum number instead of platform number.
Enable command that reports errata on MPC8572DS.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc85xx/cmd_errata.c     |    4 +++-
 arch/powerpc/cpu/mpc85xx/ddr-gen3.c       |    2 +-
 arch/powerpc/include/asm/config_mpc85xx.h |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)
Kumar Gala - Feb. 1, 2011, 4:39 a.m.
On Jan 26, 2011, at 12:22 AM, Kumar Gala wrote:

> From: York Sun <yorksun@freescale.com>
> 
> Use unique erratum number instead of platform number.
> Enable command that reports errata on MPC8572DS.
> 
> Signed-off-by: York Sun <yorksun@freescale.com>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/cpu/mpc85xx/cmd_errata.c     |    4 +++-
> arch/powerpc/cpu/mpc85xx/ddr-gen3.c       |    2 +-
> arch/powerpc/include/asm/config_mpc85xx.h |    1 +
> 3 files changed, 5 insertions(+), 2 deletions(-)

applied to 85xx

- k

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 0cc8b1e..94a5876 100644
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@ -71,7 +71,9 @@  static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 #ifdef CONFIG_SYS_FSL_ERRATUM_DDR_A003
 	puts("Work-around for Erratum DDR-A003 enabled\n");
 #endif
-
+#ifdef CONFIG_SYS_FSL_ERRATUM_DDR_115
+	puts("Work-around for Erratum DDR115 enabled\n");
+#endif
 	return 0;
 }
 
diff --git a/arch/powerpc/cpu/mpc85xx/ddr-gen3.c b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
index b9502f7..35997f2 100644
--- a/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
+++ b/arch/powerpc/cpu/mpc85xx/ddr-gen3.c
@@ -178,7 +178,7 @@  void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs,
 	 * when operatiing in 32-bit bus mode with 4-beat bursts,
 	 * This erratum does not affect DDR3 mode, only for DDR2 mode.
 	 */
-#ifdef CONFIG_MPC8572
+#ifdef CONFIG_SYS_FSL_ERRATUM_DDR_115
 	if ((((in_be32(&ddr->sdram_cfg) >> 24) & 0x7) == SDRAM_TYPE_DDR2)
 	    && in_be32(&ddr->sdram_cfg) & 0x80000) {
 		/* set DEBUG_1[31] */
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 7a0af37..8ef9743 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -77,6 +77,7 @@ 
 #define CONFIG_MAX_CPUS			2
 #define CONFIG_SYS_FSL_NUM_LAWS		12
 #define CONFIG_SYS_FSL_SEC_COMPAT	2
+#define CONFIG_SYS_FSL_ERRATUM_DDR_115
 
 #elif defined(CONFIG_P1010)
 #define CONFIG_MAX_CPUS			1