diff options
| author | Alex Frid <afrid@nvidia.com> | 2014-01-13 20:47:22 -0800 |
|---|---|---|
| committer | Yu-Huan Hsu <yhsu@nvidia.com> | 2014-01-17 14:50:11 -0800 |
| commit | e5e039d8d5fba68b75283987ec1ec07982b155f6 (patch) | |
| tree | bd22fc5afa46adab3b94f942579bea71ee02b1d5 /arch/arm/mach-tegra/dvfs.h | |
| parent | b9a322c2ca320c4a30a7991226a1646fc340e485 (diff) | |
ARM: tegra: dvfs: Don't initialize SiMon offsets
Removed SiMon offsets initialization when configuration option
CONFIG_TEGRA_USE_SIMON is not set. This also prevented registration
of SiMon notifiers (which would fail, anyway, generating unnecessary
error logging).
Bug 1343366
Change-Id: Ic54e6f113a172c2f6e7069c7a442e3e9cc0f8144
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/355377
(cherry picked from commit f04d13b84a8001c2018b3faab6d75b540e888fdb)
Reviewed-on: http://git-master/r/356946
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/dvfs.h')
| -rw-r--r-- | arch/arm/mach-tegra/dvfs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/dvfs.h b/arch/arm/mach-tegra/dvfs.h index 4565529b01bc..93b87919ffe2 100644 --- a/arch/arm/mach-tegra/dvfs.h +++ b/arch/arm/mach-tegra/dvfs.h @@ -5,7 +5,7 @@ * Author: * Colin Cross <ccross@google.com> * - * Copyright (c) 2010-2013 NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2014 NVIDIA CORPORATION. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -272,8 +272,14 @@ struct tegra_cooling_device *tegra_dvfs_get_core_vmax_cdev(void); struct tegra_cooling_device *tegra_dvfs_get_core_vmin_cdev(void); struct tegra_cooling_device *tegra_dvfs_get_gpu_vmin_cdev(void); struct tegra_cooling_device *tegra_dvfs_get_gpu_vts_cdev(void); +#ifdef CONFIG_TEGRA_USE_SIMON void tegra_dvfs_rail_init_simon_vmin_offsets( int *offsets, int offs_num, struct dvfs_rail *rail); +#else +static inline void tegra_dvfs_rail_init_simon_vmin_offsets( + int *offsets, int offs_num, struct dvfs_rail *rail) +{ } +#endif void tegra_dvfs_rail_init_vmin_thermal_profile( int *therm_trips_table, int *therm_floors_table, struct dvfs_rail *rail, struct dvfs_dfll_data *d); |