Merge branch 'master' of git://www.denx.de/git/u-boot-socfpga

[u-boot] / arch / powerpc / include / asm / fsl_errata.h

diff --git a/arch/powerpc/include/asm/fsl_errata.h b/arch/powerpc/include/asm/fsl_errata.h
index 3cac2d431079451a683e02e2caf8e431533d7871..4861e3bf8d74e45b76ad916052f4da7ce4857c46 100644 (file)
--- a/arch/powerpc/include/asm/fsl_errata.h
+++ b/arch/powerpc/include/asm/fsl_errata.h
@@ -15,11 +15,39 @@ static inline bool has_erratum_a006379(void)
 {
        u32 svr = get_svr();
        if (((SVR_SOC_VER(svr) == SVR_T4240) && SVR_MAJ(svr) <= 1) ||
-           ((SVR_SOC_VER(svr) == SVR_B4860) && SVR_MAJ(svr) <= 2))
+           ((SVR_SOC_VER(svr) == SVR_T4160) && SVR_MAJ(svr) <= 1) ||
+           ((SVR_SOC_VER(svr) == SVR_T4080) && SVR_MAJ(svr) <= 1) ||
+           ((SVR_SOC_VER(svr) == SVR_B4860) && SVR_MAJ(svr) <= 2) ||
+           ((SVR_SOC_VER(svr) == SVR_B4420) && SVR_MAJ(svr) <= 2) ||
+           ((SVR_SOC_VER(svr) == SVR_T2080) && SVR_MAJ(svr) <= 1) ||
+           ((SVR_SOC_VER(svr) == SVR_T2081) && SVR_MAJ(svr) <= 1))
                return true;
 
        return false;
 }
 #endif
+#endif
+
+#ifdef CONFIG_SYS_FSL_ERRATUM_A007186
+static inline bool has_erratum_a007186(void)
+{
+       u32 svr = get_svr();
+       u32 soc = SVR_SOC_VER(svr);
 
+       switch (soc) {
+       case SVR_T4240:
+               return IS_SVR_REV(svr, 2, 0);
+       case SVR_T4160:
+               return IS_SVR_REV(svr, 2, 0);
+       case SVR_B4860:
+               return IS_SVR_REV(svr, 2, 0);
+       case SVR_B4420:
+               return IS_SVR_REV(svr, 2, 0);
+       case SVR_T2081:
+       case SVR_T2080:
+               return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1);
+       }
+
+       return false;
+}
 #endif