From 3d99c46dab2327d57647e5000caaa342f80d2104 Mon Sep 17 00:00:00 2001
From: Deepak Nibade <dnibade@nvidia.com>
Date: Thu, 1 Dec 2016 12:24:51 +0530
Subject: gpu: nvgpu: enable gm20b clk APIs for CCF

GM20B platform specific clk API should now support
both Tegra Clock Framework and Common Clock
Framework

Hence enable those APIs for both TCF and CCF

Bug 200256389
Bug 200233943

Change-Id: If0f0568c7779e4ea16cf5e3b3e2380cf9c4cd697
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1262892
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Shreshtha Sahu <ssahu@nvidia.com>
Tested-by: Shreshtha Sahu <ssahu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Peter Boonstoppel <pboonstoppel@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
---
 drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'drivers')

diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index 01ff5f96..f61b14fa 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -26,10 +26,15 @@
 #include <linux/reset.h>
 #include <linux/tegra_soctherm.h>
 #include <linux/platform/tegra/clock.h>
+#if defined(CONFIG_TEGRA_CLK_FRAMEWORK)
 #include <linux/platform/tegra/dvfs.h>
+#endif
 #include <linux/platform/tegra/common.h>
 #include <linux/platform/tegra/mc.h>
 #include <linux/clk/tegra.h>
+#if defined(CONFIG_COMMON_CLK)
+#include <soc/tegra/tegra-dvfs.h>
+#endif
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 #include <soc/tegra/fuse.h>
 #endif
@@ -873,7 +878,7 @@ static int gk20a_tegra_suspend(struct device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_TEGRA_CLK_FRAMEWORK
+#if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_COMMON_CLK)
 static unsigned long gk20a_get_clk_rate(struct device *dev)
 {
 	struct gk20a_platform *platform = gk20a_get_platform(dev);
@@ -1022,7 +1027,7 @@ struct gk20a_platform gm20b_tegra_platform = {
 	.reset_deassert = gk20a_tegra_reset_deassert,
 #endif
 
-#ifdef CONFIG_TEGRA_CLK_FRAMEWORK
+#if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_COMMON_CLK)
 	.clk_get_rate = gk20a_get_clk_rate,
 	.clk_round_rate = gk20a_round_clk_rate,
 	.clk_set_rate = gk20a_set_clk_rate,
-- 
cgit v1.2.2