diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-01 14:55:13 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:41 -0800 |
| commit | d17b72278b43448a089da04cdb7f31943ef13db6 (patch) | |
| tree | 489b6dc2abc12e80237167fdc8f3bd6a15778a6e /arch/arm/mach-tegra/fuse.c | |
| parent | 17a1e7cf1d506da046718cafda1420a445fb6c1c (diff) | |
ARM: tegra: Use ARCH_TEGRA_DUAL_3D for GPU regsiter sets
Determine the number of GPU register sets based upon the setting
of ARCH_TEGRA_DUAL_3D.
Change-Id: I66e860fba2a979921ac4e4bd39bed99fb305996e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/50355
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R443612bad1ec0f745a51b8f301a322b5bb8cef96
Diffstat (limited to 'arch/arm/mach-tegra/fuse.c')
| -rw-r--r-- | arch/arm/mach-tegra/fuse.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c index d779f5cd7ac1..23fd8fc394d8 100644 --- a/arch/arm/mach-tegra/fuse.c +++ b/arch/arm/mach-tegra/fuse.c @@ -281,16 +281,14 @@ int tegra_sku_id(void) int tegra_gpu_register_sets(void) { -#if defined(CONFIG_ARCH_TEGRA_2x_SOC) - return 1; -#elif defined(CONFIG_ARCH_TEGRA_3x_SOC) +#ifdef CONFIG_ARCH_TEGRA_DUAL_3D u32 reg = readl(IO_TO_VIRT(TEGRA_CLK_RESET_BASE + FUSE_GPU_INFO)); if (reg & FUSE_GPU_INFO_MASK) return 1; else return 2; #else -#error ERROR! Neither 2x or 3x Tegra present + return 1; #endif } |