ARM: imx: limit errata selection to Cortex-A9 based designs

The two erratas 754322 and 775420 are Cortex-A9 specific. The i.MX 6UL
SoCs include a Cortex-A7 CPU and hence do not need this erratas enabeld.
This patch moves the errata selection from the family Kconfig symbol to
the SoC specifc Kconfig symbols where a Cortex-A9 is used.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 95584ee..e7d7b90 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -471,8 +471,6 @@ config      SOC_IMX53
 config SOC_IMX6
        bool
        select ARM_CPU_SUSPEND if (PM || CPU_IDLE)
-       select ARM_ERRATA_754322
-       select ARM_ERRATA_775420
        select ARM_GIC
        select HAVE_IMX_ANATOP
        select HAVE_IMX_GPC
@@ -484,6 +482,8 @@ config SOC_IMX6
 config SOC_IMX6Q
        bool "i.MX6 Quad/DualLite support"
        select ARM_ERRATA_764369 if SMP
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_775420
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD
        select PINCTRL_IMX6Q
@@ -494,6 +494,8 @@ config SOC_IMX6Q
 
 config SOC_IMX6SL
        bool "i.MX6 SoloLite support"
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_775420
        select PINCTRL_IMX6SL
        select SOC_IMX6
 
@@ -502,6 +504,8 @@ config SOC_IMX6SL
 
 config SOC_IMX6SLL
        bool "i.MX6 SoloLiteLite support"
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_775420
        select PINCTRL_IMX6SLL
        select SOC_IMX6
 
@@ -510,6 +514,8 @@ config SOC_IMX6SLL
 
 config SOC_IMX6SX
        bool "i.MX6 SoloX support"
+       select ARM_ERRATA_754322
+       select ARM_ERRATA_775420
        select PINCTRL_IMX6SX
        select SOC_IMX6