ARM: tegra: remove Tegra30 errata from MACH_TEGRA_DT
authorStephen Warren <swarren@nvidia.com>
Thu, 5 Apr 2012 22:50:05 +0000 (16:50 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 30 Apr 2012 18:15:02 +0000 (19:15 +0100)
BugLink: http://bugs.launchpad.net/bugs/981162

[no upstream commit match, as this is a fix for a mis-applied patch in the
previous 3.2-stable release. - gregkh]

Commit 83e4194 "ARM: tegra: select required CPU and L2 errata options"
contained two chunks; one was errata for Tegra20 (correctly applied)
and the second errata for Tegra30. The latter was accidentally applied
to the wrong config option; Tegra30 support wasn't added until v3.3,
and so the second chunk should have just been dropped. This patch does
so.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

arch/arm/mach-tegra/Kconfig

index dbc59fa..379cdc7 100644 (file)
@@ -61,11 +61,6 @@ config MACH_SEABOARD
 config MACH_TEGRA_DT
        bool "Generic Tegra board (FDT support)"
        select USE_OF
-       select ARM_ERRATA_743622
-       select ARM_ERRATA_751472
-       select ARM_ERRATA_754322
-       select ARM_ERRATA_764369
-       select PL310_ERRATA_769419 if CACHE_L2X0
        help
          Support for generic nVidia Tegra boards using Flattened Device Tree