diff mbox

[U-Boot] armv8/fsl-layerscape: Update CONFIG_LS2080A to CONFIG_FSL_LSCH3

Message ID 1478859065-2059-1-git-send-email-Shengzhou.Liu@nxp.com
State Accepted
Commit 40836e215a06d435333422b2c64fa1c01f0c4f82
Delegated to: York Sun
Headers show

Commit Message

Shengzhou Liu Nov. 11, 2016, 10:11 a.m. UTC 
Update CONFIG_LS2080A to CONFIG_FSL_LSCH3 to make those workaround
implementing of erratum reusable for more SoCs.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

York Sun Nov. 23, 2016, 12:56 a.m. UTC | #1 
On 11/11/2016 02:24 AM, Shengzhou Liu wrote:
> Update CONFIG_LS2080A to CONFIG_FSL_LSCH3 to make those workaround
> implementing of erratum reusable for more SoCs.
>
> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
> ---


Applied to fsl-qoriq, awaiting upstream. Thanks.

York
diff mbox

Patch

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index d68eeba..5a4dd39 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -50,16 +50,16 @@  bool soc_has_aiop(void)
 	return false;
 }
 
-#ifdef CONFIG_LS2080A
+#if defined(CONFIG_FSL_LSCH3)
 /*
  * This erratum requires setting a value to eddrtqcr1 to
  * optimal the DDR performance.
  */
 static void erratum_a008336(void)
 {
+#ifdef CONFIG_SYS_FSL_ERRATUM_A008336
 	u32 *eddrtqcr1;
 
-#ifdef CONFIG_SYS_FSL_ERRATUM_A008336
 #ifdef CONFIG_SYS_FSL_DCSR_DDR_ADDR
 	eddrtqcr1 = (void *)CONFIG_SYS_FSL_DCSR_DDR_ADDR + 0x800;
 	if (fsl_ddr_get_version(0) == 0x50200)
@@ -79,9 +79,9 @@  static void erratum_a008336(void)
  */
 static void erratum_a008514(void)
 {
+#ifdef CONFIG_SYS_FSL_ERRATUM_A008514
 	u32 *eddrtqcr1;
 
-#ifdef CONFIG_SYS_FSL_ERRATUM_A008514
 #ifdef CONFIG_SYS_FSL_DCSR_DDR3_ADDR
 	eddrtqcr1 = (void *)CONFIG_SYS_FSL_DCSR_DDR3_ADDR + 0x800;
 	out_le32(eddrtqcr1, 0x63b20002);
@@ -176,6 +176,7 @@  static void erratum_a009203(void)
 #endif
 #endif
 }
+
 void bypass_smmu(void)
 {
 	u32 val;