mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-23 01:50:07 +03:00
bca27e31e3
clk_gp106.h and clk_gv100.h define conflicting symbols, which prevent including them both at the same time. One of the conflicting structs is namemap_cfg, which has different definitions in clk_gp106.h and include/nvgpu/clk.h. Move all constants used only by clk_*.c to be defined there, delete the extra namemap_cfg structure definition, and modify code to cope with the unified namemap_cfg. JIRa NVGPU-596 Change-Id: Id68919da4567ec1507eda0cfaa19bf047a7bfc59 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1945285 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
44 lines
1.5 KiB
C
44 lines
1.5 KiB
C
/*
|
|
* Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#ifndef NVGPU_INCLUDE_CLK_H
|
|
#define NVGPU_INCLUDE_CLK_H
|
|
|
|
#define CLK_NAME_MAX 24
|
|
#define CLK_MAX_CNTRL_REGISTERS 2
|
|
|
|
struct namemap_cfg {
|
|
u32 namemap;
|
|
u32 is_enable; /* Namemap enabled */
|
|
u32 is_counter; /* Using cntr */
|
|
struct gk20a *g;
|
|
struct {
|
|
u32 reg_ctrl_addr;
|
|
u32 reg_ctrl_idx;
|
|
u32 reg_cntr_addr[CLK_MAX_CNTRL_REGISTERS];
|
|
} cntr;
|
|
u32 scale;
|
|
char name[CLK_NAME_MAX];
|
|
};
|
|
|
|
#endif /* NVGPU_INCLUDE_CLK_H */
|