ARM: tegra: Always lock the CPU reset vector

Currently the reset vector is not locked on Tegra20 because the hardware
doesn't support it. However in order not to depend on the chip ID, which
becomes available only later in the boot process, we set the bit anyway.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c
index 5377495d41b86e6afd7fbbc7e09748bb4980da02..894c5c472184f9cf9c08f34966b83ff982766939 100644 (file)
--- a/arch/arm/mach-tegra/reset.c
+++ b/arch/arm/mach-tegra/reset.c
@@ -54,12 +54,10 @@ static void __init tegra_cpu_reset_handler_set(const u32 reset_address)
         * Prevent further modifications to the physical reset vector.
         *  NOTE: Has no effect on chips prior to Tegra30.
         */
-       if (tegra_get_chip_id() != TEGRA20) {
-               reg = readl(sb_ctrl);
-               reg |= 2;
-               writel(reg, sb_ctrl);
-               wmb();
-       }
+       reg = readl(sb_ctrl);
+       reg |= 2;
+       writel(reg, sb_ctrl);
+       wmb();
 }
 
 static void __init tegra_cpu_reset_handler_enable(void)