diff options
| author | Thierry Reding | 2014-07-11 09:52:41 +0200 |
|---|---|---|
| committer | Thierry Reding | 2014-07-17 13:36:41 +0200 |
| commit | 304664eab93f9e95a8d28fbd9702ede88bb10cc5 (patch) | |
| tree | 9ce11babe79ed88006a40ad994ef30e2f1a55d14 /arch/arm/mach-tegra/reset.c | |
| parent | ARM: tegra: Sort includes alphabetically (diff) | |
| download | kernel-qcow2-linux-304664eab93f9e95a8d28fbd9702ede88bb10cc5.tar.gz kernel-qcow2-linux-304664eab93f9e95a8d28fbd9702ede88bb10cc5.tar.xz kernel-qcow2-linux-304664eab93f9e95a8d28fbd9702ede88bb10cc5.zip | |
ARM: tegra: Use a function to get the chip ID
Instead of using a simple variable access to get at the Tegra chip ID,
use a function so that we can run additional code. This can be used to
determine where the chip ID is being accessed without being available.
That in turn will be handy for resolving boot sequence dependencies in
order to convert more code to regular initcalls rather than a sequence
fixed by Tegra SoC setup code.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/reset.c')
| -rw-r--r-- | arch/arm/mach-tegra/reset.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c index b90507922a8c..f94fdf89d457 100644 --- a/arch/arm/mach-tegra/reset.c +++ b/arch/arm/mach-tegra/reset.c @@ -19,6 +19,8 @@ #include <linux/init.h> #include <linux/io.h> +#include <soc/tegra/fuse.h> + #include <asm/cacheflush.h> #include <asm/firmware.h> #include <asm/hardware/cache-l2x0.h> @@ -53,7 +55,7 @@ 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_chip_id != TEGRA20) { + if (tegra_get_chip_id() != TEGRA20) { reg = readl(sb_ctrl); reg |= 2; writel(reg, sb_ctrl); |