summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2011-05-19 09:35:16 +0300
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-22 11:34:52 -0700
commit52770be2ded07e2068d44539b21a2da2585bcede (patch)
treefa861cd93ae98f1591077f7f78c8f5c5bc3fc57f /arch/arm
parent62a5540a21fea8e5c9ef1b50da90b480f51534fc (diff)
nvhost: Make 3D workaround Tegra3 A01 only
3D hardware workaround is needed for Tegra3 A01 only. With this patch, we read run-time whether it should be enabled or not. Workaround should be removed once A01's have been phased out. Bug 786316 Change-Id: Icd1b85b30a53c74d2e5c7a6df65a805d1fe5147c Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/32136 Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/fuse.h17
-rw-r--r--arch/arm/mach-tegra/include/mach/hardware.h20
2 files changed, 21 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h
index 48ee9bf1ac7b..65c43c6843a0 100644
--- a/arch/arm/mach-tegra/fuse.h
+++ b/arch/arm/mach-tegra/fuse.h
@@ -18,22 +18,7 @@
*
*/
-enum tegra_chipid {
- TEGRA_CHIPID_UNKNOWN = 0,
- TEGRA_CHIPID_TEGRA2 = 0x20,
- TEGRA_CHIPID_TEGRA3 = 0x30,
-};
-
-enum tegra_revision {
- TEGRA_REVISION_UNKNOWN = 0,
- TEGRA_REVISION_A01,
- TEGRA_REVISION_A02,
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
- TEGRA_REVISION_A03,
- TEGRA_REVISION_A03p,
-#endif
- TEGRA_REVISION_MAX,
-};
+#include <mach/hardware.h>
#define INVALID_PROCESS_ID 99 /* don't expect to have 100 process id's */
diff --git a/arch/arm/mach-tegra/include/mach/hardware.h b/arch/arm/mach-tegra/include/mach/hardware.h
index 6014edf60d93..bd0beac8e175 100644
--- a/arch/arm/mach-tegra/include/mach/hardware.h
+++ b/arch/arm/mach-tegra/include/mach/hardware.h
@@ -2,6 +2,7 @@
* arch/arm/mach-tegra/include/mach/hardware.h
*
* Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2011 NVIDIA Corp.
*
* Author:
* Colin Cross <ccross@google.com>
@@ -21,4 +22,23 @@
#ifndef __MACH_TEGRA_HARDWARE_H
#define __MACH_TEGRA_HARDWARE_H
+enum tegra_chipid {
+ TEGRA_CHIPID_UNKNOWN = 0,
+ TEGRA_CHIPID_TEGRA2 = 0x20,
+ TEGRA_CHIPID_TEGRA3 = 0x30,
+};
+
+enum tegra_revision {
+ TEGRA_REVISION_UNKNOWN = 0,
+ TEGRA_REVISION_A01,
+ TEGRA_REVISION_A02,
+#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
+ TEGRA_REVISION_A03,
+ TEGRA_REVISION_A03p,
+#endif
+ TEGRA_REVISION_MAX,
+};
+
+enum tegra_chipid tegra_get_chipid(void);
+enum tegra_revision tegra_get_revision(void);
#endif