diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ | |||
26 | #include <linux/reset.h> | 26 | #include <linux/reset.h> |
27 | #include <linux/tegra_soctherm.h> | 27 | #include <linux/tegra_soctherm.h> |
28 | #include <linux/platform/tegra/clock.h> | 28 | #include <linux/platform/tegra/clock.h> |
29 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) | ||
29 | #include <linux/platform/tegra/dvfs.h> | 30 | #include <linux/platform/tegra/dvfs.h> |
31 | #endif | ||
30 | #include <linux/platform/tegra/common.h> | 32 | #include <linux/platform/tegra/common.h> |
31 | #include <linux/platform/tegra/mc.h> | 33 | #include <linux/platform/tegra/mc.h> |
32 | #include <linux/clk/tegra.h> | 34 | #include <linux/clk/tegra.h> |
35 | #if defined(CONFIG_COMMON_CLK) | ||
36 | #include <soc/tegra/tegra-dvfs.h> | ||
37 | #endif | ||
33 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) | 38 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) |
34 | #include <soc/tegra/fuse.h> | 39 | #include <soc/tegra/fuse.h> |
35 | #endif | 40 | #endif |
@@ -873,7 +878,7 @@ static int gk20a_tegra_suspend(struct device *dev) | |||
873 | return 0; | 878 | return 0; |
874 | } | 879 | } |
875 | 880 | ||
876 | #ifdef CONFIG_TEGRA_CLK_FRAMEWORK | 881 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_COMMON_CLK) |
877 | static unsigned long gk20a_get_clk_rate(struct device *dev) | 882 | static unsigned long gk20a_get_clk_rate(struct device *dev) |
878 | { | 883 | { |
879 | struct gk20a_platform *platform = gk20a_get_platform(dev); | 884 | struct gk20a_platform *platform = gk20a_get_platform(dev); |
@@ -1022,7 +1027,7 @@ struct gk20a_platform gm20b_tegra_platform = { | |||
1022 | .reset_deassert = gk20a_tegra_reset_deassert, | 1027 | .reset_deassert = gk20a_tegra_reset_deassert, |
1023 | #endif | 1028 | #endif |
1024 | 1029 | ||
1025 | #ifdef CONFIG_TEGRA_CLK_FRAMEWORK | 1030 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_COMMON_CLK) |
1026 | .clk_get_rate = gk20a_get_clk_rate, | 1031 | .clk_get_rate = gk20a_get_clk_rate, |
1027 | .clk_round_rate = gk20a_round_clk_rate, | 1032 | .clk_round_rate = gk20a_round_clk_rate, |
1028 | .clk_set_rate = gk20a_set_clk_rate, | 1033 | .clk_set_rate = gk20a_set_clk_rate, |