gpu: nvgpu: Fix build without Tegra clk framework

Do not build clock code if TEGRA_CLK_FRAMEWORK is not defined. Also
make GK20A_DEVFREQ depend on TEGRA_CLK_FRAMEWORK, and build scaling
governor only if GK20A_DEVFREQ is enabled.

Bug 1567274

Change-Id: I6ea1462e7a110fb46c9d66ceda71167cff19699e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/562475

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 5d98b98b..cf5d65cc 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -25,12 +25,10 @@ nvgpu-y := \
         gk20a/priv_ring_gk20a.o \
         gk20a/semaphore_gk20a.o \
         gk20a/fence_gk20a.o \
-        gk20a/clk_gk20a.o \
         gk20a/therm_gk20a.o \
         gk20a/gr_ctx_gk20a_sim.o \
         gk20a/gr_ctx_gk20a.o \
         gk20a/gk20a_gating_reglist.o \
-        gk20a/gk20a_scale.o \
         gk20a/gk20a_sysfs.o \
         gk20a/ltc_gk20a.o \
         gk20a/fb_gk20a.o \
@@ -50,7 +48,6 @@ nvgpu-y := \
         gm20b/gm20b_gating_reglist.o \
         gm20b/acr_gm20b.o \
         gm20b/pmu_gm20b.o \
-        gm20b/clk_gm20b.o \
         gm20b/mm_gm20b.o \
         gm20b/regops_gm20b.o
 
@@ -64,3 +61,10 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/fifo_vgpu.o \
         vgpu/mm_vgpu.o \
         vgpu/vgpu.o
+
+nvgpu-$(CONFIG_TEGRA_CLK_FRAMEWORK) += \
+        gm20b/clk_gm20b.o \
+        gk20a/clk_gk20a.o
+
+nvgpu-$(CONFIG_GK20A_DEVFREQ) += \
+        gk20a/gk20a_scale.o