gpu: nvgpu: Move therm HAL to common

Move implementation of therm HAL to common/therm. ELCG and BLCG
code was embedded in gr HAL, so moved that code to therm.

Bump gk20a code to gm20b.

JIRA NVGPU-955

Change-Id: I9b03e52f2832d3a1d89071a577e8ce106aaf603b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1795989
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 8c289947..4ca4b6d8 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -37,7 +37,12 @@ nvgpu-y += common/bus/bus_gk20a.o \
         common/fb/fb_gp106.o \
         common/fb/fb_gv11b.o \
         common/fb/fb_gv100.o \
-        common/xve/xve_gp106.o
+        common/xve/xve_gp106.o \
+        common/therm/therm.o \
+        common/therm/therm_gm20b.o \
+        common/therm/therm_gp10b.o \
+        common/therm/therm_gp106.o \
+        common/therm/therm_gv11b.o
 
 # Linux specific parts of nvgpu.
 nvgpu-y += \
@@ -204,7 +209,6 @@ nvgpu-y += \
         gk20a/pmu_gk20a.o \
         gk20a/flcn_gk20a.o \
         gk20a/fence_gk20a.o \
-        gk20a/therm_gk20a.o \
         gk20a/gr_ctx_gk20a_sim.o \
         gk20a/gr_ctx_gk20a.o \
         gk20a/hal.o \
@@ -221,7 +225,6 @@ nvgpu-y += \
         gm20b/pmu_gm20b.o \
         gm20b/mm_gm20b.o \
         gm20b/regops_gm20b.o \
-        gm20b/therm_gm20b.o \
         gm20b/fuse_gm20b.o \
         boardobj/boardobj.o \
         boardobj/boardobjgrp.o \
@@ -268,7 +271,6 @@ nvgpu-y += \
         gp10b/pmu_gp10b.o \
         gp10b/hal_gp10b.o \
         gp10b/regops_gp10b.o \
-        gp10b/therm_gp10b.o \
         gp10b/fecs_trace_gp10b.o \
         gp10b/gp10b.o \
         gp10b/fuse_gp10b.o \
@@ -301,7 +303,6 @@ nvgpu-y += \
         gv11b/acr_gv11b.o \
         gv11b/subctx_gv11b.o \
         gv11b/regops_gv11b.o \
-        gv11b/therm_gv11b.o \
         gv11b/ecc_gv11b.o \
         gv100/mm_gv100.o \
         gv100/gr_ctx_gv100.o \
@@ -328,7 +329,6 @@ nvgpu-y += \
         clk/clk.o \
         gp106/clk_gp106.o \
         gp106/clk_arb_gp106.o \
-        gp106/therm_gp106.o \
         pmgr/pwrdev.o \
         pmgr/pmgr.o \
         pmgr/pmgrpmu.o \