diff options
| author | Diwakar Tundlam <dtundlam@nvidia.com> | 2011-12-05 14:09:59 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-22 23:49:21 -0700 |
| commit | ae87be147bf095703efa9c4c2de9e4a24f180fa8 (patch) | |
| tree | 2f9ae713c90fd541a708881cc227c6a142079c14 /arch/arm/mach-tegra/fuse.h | |
| parent | 2dac8a72e7ff7984ed103fee95b124bf01583037 (diff) | |
arm: tegra: Fix Tegra2/Tegra3 conditionals for speedo APIs
Change-Id: Ia97169c6bcc84dac03439ff9feb9e8b37763fa09
Signed-off-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-on: http://git-master/r/68284
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Rebase-Id: R0d68c07f9505f244ad57c817727a1ea39cccedbb
Diffstat (limited to 'arch/arm/mach-tegra/fuse.h')
| -rw-r--r-- | arch/arm/mach-tegra/fuse.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h index 7b76ee54b78c..88ea8402978a 100644 --- a/arch/arm/mach-tegra/fuse.h +++ b/arch/arm/mach-tegra/fuse.h @@ -34,16 +34,19 @@ const char *tegra_get_revision_name(void); int tegra_cpu_process_id(void); int tegra_core_process_id(void); -int tegra_cpu_speedo_id(void); int tegra_soc_speedo_id(void); -int tegra_cpu_speedo_mv(void); -int tegra_core_speedo_mv(void); void tegra_init_speedo_data(void); #ifndef CONFIG_ARCH_TEGRA_2x_SOC int tegra_package_id(void); +int tegra_cpu_speedo_id(void); +int tegra_cpu_speedo_mv(void); +int tegra_core_speedo_mv(void); #else static inline int tegra_package_id(void) { return -1; } +static inline int tegra_cpu_speedo_id(void) { return 0; } +static inline int tegra_cpu_speedo_mv(void) { return 1000; } +static inline int tegra_core_speedo_mv(void) { return 1200; } #endif #else @@ -52,6 +55,7 @@ static inline int tegra_cpu_process_id(void) { return 0; } static inline int tegra_core_process_id(void) { return 0; } static inline int tegra_cpu_speedo_id(void) { return 0; } static inline int tegra_soc_speedo_id(void) { return 0; } +static inline int tegra_package_id(void) { return -1; } static inline int tegra_cpu_speedo_mv(void) { return 1000; } static inline int tegra_core_speedo_mv(void) { return 1200; } static inline void tegra_init_speedo_data(void) { } |