gpu: nvgpu: update pwm source enum & VFE entry

JIRA DNVGPU-123

Change-Id: Ia28db5d645aa431f11dc8720bf1d08e6d756e20f
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1227670
(cherry picked from commit 2c7f89ceef3f9173fefa44b1a959345744e66536)
Reviewed-on: http://git-master/r/1244659
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/ctrl/ctrlvolt.h b/drivers/gpu/nvgpu/ctrl/ctrlvolt.h
index 04c7c4d1..9a095043 100644
--- a/drivers/gpu/nvgpu/ctrl/ctrlvolt.h
+++ b/drivers/gpu/nvgpu/ctrl/ctrlvolt.h
@@ -26,6 +26,7 @@
 #define CTRL_VOLT_DOMAIN_INVALID        0x00
 #define CTRL_VOLT_DOMAIN_LOGIC          0x01
 #define CLK_PROG_VFE_ENTRY_LOGIC        0x00
+#define CLK_PROG_VFE_ENTRY_SRAM 0x01
 
 /*
  * Macros for Voltage Domain HAL.
@@ -60,7 +61,8 @@
 
 enum nv_pmu_pmgr_pwm_source {
         NV_PMU_PMGR_PWM_SOURCE_INVALID = 0,
-        NV_PMU_PMGR_PWM_SOURCE_THERM_VID_PWM_1 = 5,
+        NV_PMU_PMGR_PWM_SOURCE_THERM_VID_PWM_0 = 4,
+        NV_PMU_PMGR_PWM_SOURCE_THERM_VID_PWM_1,
         NV_PMU_PMGR_PWM_SOURCE_RSVD_0 = 7,
         NV_PMU_PMGR_PWM_SOURCE_RSVD_1 = 8,
 };
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 22a9ce4c..ec0b4ba9 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -624,6 +624,7 @@ struct gpu_ops {
                 void (*disable_slowboot)(struct gk20a *g);
                 int (*init_clk_support)(struct gk20a *g);
                 int (*suspend_clk_support)(struct gk20a *g);
+                u32 (*get_crystal_clk_hz)(struct gk20a *g);
         } clk;
         bool privsecurity;
         bool securegpccs;