diff options
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_domain.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_fll.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_freq_controller.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_mclk.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_prog.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vf_point.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vin.h | 6 |
8 files changed, 24 insertions, 24 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/clk/clk.h index 0a0d9c98..5a6aeae3 100644 --- a/drivers/gpu/nvgpu/clk/clk.h +++ b/drivers/gpu/nvgpu/clk/clk.h | |||
@@ -21,8 +21,8 @@ | |||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #ifndef _CLK_H_ | 24 | #ifndef NVGPU_CLK_H |
25 | #define _CLK_H_ | 25 | #define NVGPU_CLK_H |
26 | 26 | ||
27 | #include "clk_vin.h" | 27 | #include "clk_vin.h" |
28 | #include "clk_fll.h" | 28 | #include "clk_fll.h" |
@@ -140,4 +140,4 @@ u32 nvgpu_clk_vf_change_inject_data_fill_gp10x(struct gk20a *g, | |||
140 | u32 nvgpu_clk_set_boot_fll_clk_gv10x(struct gk20a *g); | 140 | u32 nvgpu_clk_set_boot_fll_clk_gv10x(struct gk20a *g); |
141 | int clk_pmu_freq_effective_avg_load(struct gk20a *g, bool bload); | 141 | int clk_pmu_freq_effective_avg_load(struct gk20a *g, bool bload); |
142 | u32 clk_freq_effective_avg(struct gk20a *g, u32 clkDomainMask); | 142 | u32 clk_freq_effective_avg(struct gk20a *g, u32 clkDomainMask); |
143 | #endif | 143 | #endif /* NVGPU_CLK_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h index a8ae0d48..e5a7153e 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.h +++ b/drivers/gpu/nvgpu/clk/clk_domain.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKDOMAIN_H_ | 23 | #ifndef NVGPU_CLK_DOMAIN_H |
24 | #define _CLKDOMAIN_H_ | 24 | #define NVGPU_CLK_DOMAIN_H |
25 | 25 | ||
26 | #include "ctrl/ctrlclk.h" | 26 | #include "ctrl/ctrlclk.h" |
27 | #include "ctrl/ctrlboardobj.h" | 27 | #include "ctrl/ctrlboardobj.h" |
@@ -154,4 +154,4 @@ int clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk); | |||
154 | ((struct clk_domain *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ | 154 | ((struct clk_domain *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ |
155 | &pclk->clk_domainobjs.super.super, (u8)(idx))) | 155 | &pclk->clk_domainobjs.super.super, (u8)(idx))) |
156 | 156 | ||
157 | #endif | 157 | #endif /* NVGPU_CLK_DOMAIN_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h index 7f7cad97..6cbdfe2e 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.h +++ b/drivers/gpu/nvgpu/clk/clk_fll.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKFLL_H_ | 23 | #ifndef NVGPU_CLK_FLL_H |
24 | #define _CLKFLL_H_ | 24 | #define NVGPU_CLK_FLL_H |
25 | 25 | ||
26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 26 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
27 | #include "boardobj/boardobjgrp_e32.h" | 27 | #include "boardobj/boardobjgrp_e32.h" |
@@ -78,4 +78,4 @@ u32 nvgpu_clk_get_vbios_clk_domain_gp10x( u32 vbios_domain); | |||
78 | #define CLK_FLL_LUT_STEP_SIZE_UV(pclk) \ | 78 | #define CLK_FLL_LUT_STEP_SIZE_UV(pclk) \ |
79 | (pclk->avfs_fllobjs.lut_step_size_uv) | 79 | (pclk->avfs_fllobjs.lut_step_size_uv) |
80 | 80 | ||
81 | #endif | 81 | #endif /* NVGPU_CLK_FLL_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.h b/drivers/gpu/nvgpu/clk/clk_freq_controller.h index 659b75d5..7ae475c1 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.h +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLK_FREQ_CONTROLLER_H_ | 23 | #ifndef NVGPU_CLK_FREQ_CONTROLLER_H |
24 | #define _CLK_FREQ_CONTROLLER_H_ | 24 | #define NVGPU_CLK_FREQ_CONTROLLER_H |
25 | 25 | ||
26 | #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL 0xFF | 26 | #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL 0xFF |
27 | #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_SYS 0x00 | 27 | #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_SYS 0x00 |
@@ -81,4 +81,4 @@ struct clk_freq_controllers { | |||
81 | int clk_freq_controller_sw_setup(struct gk20a *g); | 81 | int clk_freq_controller_sw_setup(struct gk20a *g); |
82 | int clk_freq_controller_pmu_setup(struct gk20a *g); | 82 | int clk_freq_controller_pmu_setup(struct gk20a *g); |
83 | 83 | ||
84 | #endif | 84 | #endif /* NVGPU_CLK_FREQ_CONTROLLER_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.h b/drivers/gpu/nvgpu/clk/clk_mclk.h index 00356c98..47c81d11 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.h +++ b/drivers/gpu/nvgpu/clk/clk_mclk.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKMCLK_H_ | 23 | #ifndef NVGPU_CLK_MCLK_H |
24 | #define _CLKMCLK_H_ | 24 | #define NVGPU_CLK_MCLK_H |
25 | 25 | ||
26 | #include <nvgpu/lock.h> | 26 | #include <nvgpu/lock.h> |
27 | 27 | ||
@@ -57,4 +57,4 @@ struct clk_mclk_state { | |||
57 | #endif | 57 | #endif |
58 | }; | 58 | }; |
59 | 59 | ||
60 | #endif | 60 | #endif /* NVGPU_CLK_MCLK_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h index cabe0bf0..af6368fd 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.h +++ b/drivers/gpu/nvgpu/clk/clk_prog.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKPROG_H_ | 23 | #ifndef NVGPU_CLK_PROG_H |
24 | #define _CLKPROG_H_ | 24 | #define NVGPU_CLK_PROG_H |
25 | #include "ctrl/ctrlclk.h" | 25 | #include "ctrl/ctrlclk.h" |
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
@@ -97,4 +97,4 @@ struct clk_prog_1x_master_table { | |||
97 | ((struct clk_prog *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ | 97 | ((struct clk_prog *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ |
98 | &pclk->clk_progobjs.super.super, (u8)(idx))) | 98 | &pclk->clk_progobjs.super.super, (u8)(idx))) |
99 | 99 | ||
100 | #endif | 100 | #endif /* NVGPU_CLK_PROG_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index a4e2f48f..b72fe64c 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKVFPOINT_H_ | 23 | #ifndef NVGPU_CLK_VF_POINT_H |
24 | #define _CLKVFPOINT_H_ | 24 | #define NVGPU_CLK_VF_POINT_H |
25 | #include "ctrl/ctrlclk.h" | 25 | #include "ctrl/ctrlclk.h" |
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 27 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
@@ -80,4 +80,4 @@ struct clk_vf_point_freq { | |||
80 | 80 | ||
81 | struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs); | 81 | struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs); |
82 | 82 | ||
83 | #endif | 83 | #endif /* NVGPU_CLK_VF_POINT_H */ |
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.h b/drivers/gpu/nvgpu/clk/clk_vin.h index 9396c848..73b93e40 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.h +++ b/drivers/gpu/nvgpu/clk/clk_vin.h | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef _CLKVIN_H_ | 23 | #ifndef NVGPU_CLK_VIN_H |
24 | #define _CLKVIN_H_ | 24 | #define NVGPU_CLK_VIN_H |
25 | 25 | ||
26 | #include "boardobj/boardobj.h" | 26 | #include "boardobj/boardobj.h" |
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
@@ -76,4 +76,4 @@ u32 clk_avfs_get_vin_cal_fuse_v20(struct gk20a *g, | |||
76 | struct avfsvinobjs *pvinobjs, | 76 | struct avfsvinobjs *pvinobjs, |
77 | struct vin_device_v20 *pvindev); | 77 | struct vin_device_v20 *pvindev); |
78 | 78 | ||
79 | #endif | 79 | #endif /* NVGPU_CLK_VIN_H */ |