From 2d7534a344412409d03e4a341614e4320c48879b Mon Sep 17 00:00:00 2001
From: Jiang Yutang <b14898@freescale.com>
Date: Sun, 30 Jan 2011 17:06:20 -0600
Subject: [PATCH] powerpc/85xx: Enable various errata on P1022/P1013 SoCs

Enable workaround for errata ELBC A001, ESDHC 111 & SATA A001 on
P1022/P1013 SoCs.

Also updated P1022DS config to properly enable CONFIG_FSL_SATA_V2.

Signed-off-by: Jiang Yutang <b14898@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/include/asm/config_mpc85xx.h | 6 ++++++
 include/configs/P1022DS.h                 | 1 +
 2 files changed, 7 insertions(+)

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 3a29d1cd2f..22086a0f0e 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -103,6 +103,9 @@
 #define CONFIG_SYS_FSL_NUM_LAWS		12
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_SEC_COMPAT	2
+#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
+#define CONFIG_FSL_SATA_ERRATUM_A001
 
 #elif defined(CONFIG_P1014)
 #define CONFIG_MAX_CPUS			1
@@ -127,6 +130,9 @@
 #define CONFIG_SYS_FSL_NUM_LAWS		12
 #define CONFIG_TSECV2
 #define CONFIG_SYS_FSL_SEC_COMPAT	2
+#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
+#define CONFIG_FSL_SATA_ERRATUM_A001
 
 #elif defined(CONFIG_P2010)
 #define CONFIG_MAX_CPUS			1
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index cb240418fe..84b7e1d22e 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -279,6 +279,7 @@
 /* SATA */
 #define CONFIG_LIBATA
 #define CONFIG_FSL_SATA
+#define CONFIG_FSL_SATA_V2
 
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_SATA1
-- 
2.39.5