diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-05-10 11:05:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-05 02:05:18 -0400 |
commit | 673dd971600b26131c0afdb221e13c080da022fd (patch) | |
tree | 7c8416ac2ef61891812773d55c8c8dc61da824aa /drivers/gpu/nvgpu/clk | |
parent | 7668ccb2a2e4a8c13d82b427c65be79c725afe08 (diff) |
gpu: nvgpu: moved & renamed "struct pmu_gk20a"
- Renamed "struct pmu_gk20a" to "struct nvgpu_pmu" then moved
to file "pmu.h" under folder "drivers/gpu/nvgpu/include/nvgpu/"
- Included header file "pmu.h" to dependent file &
removed "pmu_gk20a.h" include if its usage is not present.
- Replaced "struct pmu_gk20a" with "struct nvgpu_pmu" in dependent
source & header files.
JIRA NVGPU-56
Change-Id: Ia3c606616831027093d5c216959c6a40d7c2632e
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1479209
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/clk')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_domain.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_fll.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_freq_controller.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_mclk.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_prog.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vf_point.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vin.c | 4 |
8 files changed, 5 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c index c1b8d5e1..72b6d246 100644 --- a/drivers/gpu/nvgpu/clk/clk.c +++ b/drivers/gpu/nvgpu/clk/clk.c | |||
@@ -11,13 +11,14 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <nvgpu/pmu.h> | ||
15 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
16 | |||
14 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/gk20a.h" |
15 | #include "clk.h" | 18 | #include "clk.h" |
16 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
17 | #include "ctrl/ctrlclk.h" | 19 | #include "ctrl/ctrlclk.h" |
18 | #include "ctrl/ctrlvolt.h" | 20 | #include "ctrl/ctrlvolt.h" |
19 | #include "volt/volt.h" | 21 | #include "volt/volt.h" |
20 | #include "gk20a/pmu_gk20a.h" | ||
21 | 22 | ||
22 | #define BOOT_GPC2CLK_MHZ 2581 | 23 | #define BOOT_GPC2CLK_MHZ 2581 |
23 | #define BOOT_MCLK_MHZ 3003 | 24 | #define BOOT_MCLK_MHZ 3003 |
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 84ce7371..5152772c 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include "boardobj/boardobjgrp_e32.h" | 21 | #include "boardobj/boardobjgrp_e32.h" |
22 | #include "ctrl/ctrlclk.h" | 22 | #include "ctrl/ctrlclk.h" |
23 | #include "ctrl/ctrlvolt.h" | 23 | #include "ctrl/ctrlvolt.h" |
24 | #include "gk20a/pmu_gk20a.h" | ||
25 | 24 | ||
26 | static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs); | 25 | static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs); |
27 | 26 | ||
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index e097e593..7d1264ab 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include "boardobj/boardobjgrp_e32.h" | 20 | #include "boardobj/boardobjgrp_e32.h" |
21 | #include "ctrl/ctrlclk.h" | 21 | #include "ctrl/ctrlclk.h" |
22 | #include "ctrl/ctrlvolt.h" | 22 | #include "ctrl/ctrlvolt.h" |
23 | #include "gk20a/pmu_gk20a.h" | ||
24 | 23 | ||
25 | static u32 devinit_get_fll_device_table(struct gk20a *g, | 24 | static u32 devinit_get_fll_device_table(struct gk20a *g, |
26 | struct avfsfllobjs *pfllobjs); | 25 | struct avfsfllobjs *pfllobjs); |
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index 632d7b35..9bc1390a 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "boardobj/boardobjgrp_e32.h" | 22 | #include "boardobj/boardobjgrp_e32.h" |
23 | #include "ctrl/ctrlclk.h" | 23 | #include "ctrl/ctrlclk.h" |
24 | #include "ctrl/ctrlvolt.h" | 24 | #include "ctrl/ctrlvolt.h" |
25 | #include "gk20a/pmu_gk20a.h" | ||
26 | 25 | ||
27 | static u32 clk_freq_controller_pmudatainit_super(struct gk20a *g, | 26 | static u32 clk_freq_controller_pmudatainit_super(struct gk20a *g, |
28 | struct boardobj *board_obj_ptr, | 27 | struct boardobj *board_obj_ptr, |
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index 3996c0e1..068e7234 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <nvgpu/kmem.h> | 17 | #include <nvgpu/kmem.h> |
18 | 18 | ||
19 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/pmu_gk20a.h" | ||
21 | #ifdef CONFIG_DEBUG_FS | 20 | #ifdef CONFIG_DEBUG_FS |
22 | #include "gk20a/platform_gk20a.h" | 21 | #include "gk20a/platform_gk20a.h" |
23 | #endif | 22 | #endif |
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 5697c255..047eb04a 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c | |||
@@ -12,7 +12,6 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <nvgpu/bios.h> | 14 | #include <nvgpu/bios.h> |
15 | |||
16 | #include <nvgpu/kmem.h> | 15 | #include <nvgpu/kmem.h> |
17 | 16 | ||
18 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/gk20a.h" |
@@ -24,7 +23,6 @@ | |||
24 | #include "gm206/bios_gm206.h" | 23 | #include "gm206/bios_gm206.h" |
25 | #include "ctrl/ctrlclk.h" | 24 | #include "ctrl/ctrlclk.h" |
26 | #include "ctrl/ctrlvolt.h" | 25 | #include "ctrl/ctrlvolt.h" |
27 | #include "gk20a/pmu_gk20a.h" | ||
28 | 26 | ||
29 | static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs); | 27 | static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs); |
30 | static u32 devinit_get_clk_prog_table(struct gk20a *g, | 28 | static u32 devinit_get_clk_prog_table(struct gk20a *g, |
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 3ec111f0..a53af185 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | |||
14 | #include "gk20a/gk20a.h" | 15 | #include "gk20a/gk20a.h" |
15 | #include "clk.h" | 16 | #include "clk.h" |
16 | #include "clk_vf_point.h" | 17 | #include "clk_vf_point.h" |
@@ -18,7 +19,6 @@ | |||
18 | #include "boardobj/boardobjgrp_e32.h" | 19 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "ctrl/ctrlclk.h" | 20 | #include "ctrl/ctrlclk.h" |
20 | #include "ctrl/ctrlvolt.h" | 21 | #include "ctrl/ctrlvolt.h" |
21 | #include "gk20a/pmu_gk20a.h" | ||
22 | 22 | ||
23 | static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj | 23 | static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj |
24 | *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); | 24 | *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); |
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 0fceb89d..04f7b231 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -12,18 +12,16 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <nvgpu/bios.h> | 14 | #include <nvgpu/bios.h> |
15 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
15 | 16 | ||
16 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/gk20a.h" |
17 | 18 | ||
18 | #include "boardobj/boardobjgrp.h" | 19 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 20 | #include "boardobj/boardobjgrp_e32.h" |
20 | 21 | ||
21 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
22 | |||
23 | #include "ctrl/ctrlvolt.h" | 22 | #include "ctrl/ctrlvolt.h" |
24 | 23 | ||
25 | #include "gm206/bios_gm206.h" | 24 | #include "gm206/bios_gm206.h" |
26 | #include "gk20a/pmu_gk20a.h" | ||
27 | 25 | ||
28 | #include "clk.h" | 26 | #include "clk.h" |
29 | #include "clk_vin.h" | 27 | #include "clk_vin.h" |