diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-10-26 15:49:50 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-27 11:56:13 -0400 |
commit | 7974ad17bb7f389e5634bde58a91304918097495 (patch) | |
tree | 284f0df014b39637fd51a34c8112d5142a66adfa | |
parent | fc5abc2523b3c0ca8b0b542a58ca068b6b1b1059 (diff) |
gpu: nvgpu: Protect tegra_clk behind CCF flag
clk_gk20a.h is used for dGPU and iGPU clocks. Because in gm20b the
clocks are owned by nvgpu, it has references to Linux CCF. Protect
the references behind #ifdef CONFIG_COMMON_CLK to compile it out on
non-Linux platforms.
JIRA NVGPU-259
Change-Id: I6ff095de7acaf1f828897cf3416acfaf050f8b51
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1586414
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index 0280eb28..77a6669d 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h | |||
@@ -91,8 +91,8 @@ struct namemap_cfg; | |||
91 | 91 | ||
92 | struct clk_gk20a { | 92 | struct clk_gk20a { |
93 | struct gk20a *g; | 93 | struct gk20a *g; |
94 | struct clk *tegra_clk; | ||
95 | #if defined(CONFIG_COMMON_CLK) | 94 | #if defined(CONFIG_COMMON_CLK) |
95 | struct clk *tegra_clk; | ||
96 | struct clk_hw hw; | 96 | struct clk_hw hw; |
97 | #endif | 97 | #endif |
98 | struct pll gpc_pll; | 98 | struct pll gpc_pll; |