diff options
Diffstat (limited to 'drivers/gpu/nvgpu/pmuif')
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifclk.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifseq.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuiftherm.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/gpmuifvolt.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h b/drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h index f9ffb4b1..6df92c1d 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuif_pmu.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #ifndef _GPMUIFPMU_H_ | 13 | #ifndef _GPMUIFPMU_H_ |
14 | #define _GPMUIFPMU_H_ | 14 | #define _GPMUIFPMU_H_ |
15 | 15 | ||
16 | #include "gk20a/pmu_common.h" | 16 | #include <nvgpu/flcnif_cmn.h> |
17 | #include "gpmuif_cmn.h" | 17 | #include "gpmuif_cmn.h" |
18 | 18 | ||
19 | /* Make sure size of this structure is a multiple of 4 bytes */ | 19 | /* Make sure size of this structure is a multiple of 4 bytes */ |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h b/drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h index b3fc127f..8da31469 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifboardobj.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #ifndef _GPMUIFBOARDOBJ_H_ | 13 | #ifndef _GPMUIFBOARDOBJ_H_ |
14 | #define _GPMUIFBOARDOBJ_H_ | 14 | #define _GPMUIFBOARDOBJ_H_ |
15 | 15 | ||
16 | #include "gk20a/pmu_common.h" | 16 | #include <nvgpu/flcnif_cmn.h> |
17 | #include "ctrl/ctrlboardobj.h" | 17 | #include "ctrl/ctrlboardobj.h" |
18 | 18 | ||
19 | /* | 19 | /* |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h index 0af94eaa..5747b0df 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifclk.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifclk.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -20,7 +20,7 @@ | |||
20 | #include "ctrl/ctrlclk.h" | 20 | #include "ctrl/ctrlclk.h" |
21 | #include "pmuif/gpmuifboardobj.h" | 21 | #include "pmuif/gpmuifboardobj.h" |
22 | #include "pmuif/gpmuifvolt.h" | 22 | #include "pmuif/gpmuifvolt.h" |
23 | #include "gk20a/pmu_common.h" | 23 | #include <nvgpu/flcnif_cmn.h> |
24 | 24 | ||
25 | enum nv_pmu_clk_clkwhich { | 25 | enum nv_pmu_clk_clkwhich { |
26 | clkwhich_mclk = 5, | 26 | clkwhich_mclk = 5, |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h index 89cc27d1..08739902 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifpmgr.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -17,7 +17,7 @@ | |||
17 | #include "gk20a/pmu_common.h" | 17 | #include "gk20a/pmu_common.h" |
18 | #include "ctrl/ctrlpmgr.h" | 18 | #include "ctrl/ctrlpmgr.h" |
19 | #include "pmuif/gpmuifboardobj.h" | 19 | #include "pmuif/gpmuifboardobj.h" |
20 | #include "gk20a/pmu_common.h" | 20 | #include <nvgpu/flcnif_cmn.h> |
21 | 21 | ||
22 | struct nv_pmu_pmgr_i2c_device_desc { | 22 | struct nv_pmu_pmgr_i2c_device_desc { |
23 | struct nv_pmu_boardobj super; | 23 | struct nv_pmu_boardobj super; |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifseq.h b/drivers/gpu/nvgpu/pmuif/gpmuifseq.h index 69d55490..2927206f 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifseq.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifseq.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -13,7 +13,7 @@ | |||
13 | #ifndef _GPMUIFSEQ_H_ | 13 | #ifndef _GPMUIFSEQ_H_ |
14 | #define _GPMUIFSEQ_H_ | 14 | #define _GPMUIFSEQ_H_ |
15 | 15 | ||
16 | #include "gk20a/pmu_common.h" | 16 | #include <nvgpu/flcnif_cmn.h> |
17 | 17 | ||
18 | #define PMU_UNIT_SEQ (0x02) | 18 | #define PMU_UNIT_SEQ (0x02) |
19 | 19 | ||
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuiftherm.h b/drivers/gpu/nvgpu/pmuif/gpmuiftherm.h index c87fe8a8..27e811ff 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuiftherm.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuiftherm.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -14,7 +14,7 @@ | |||
14 | #ifndef _GPMUIFTHERM_H_ | 14 | #ifndef _GPMUIFTHERM_H_ |
15 | #define _GPMUIFTHERM_H_ | 15 | #define _GPMUIFTHERM_H_ |
16 | 16 | ||
17 | #include "gk20a/pmu_common.h" | 17 | #include <nvgpu/flcnif_cmn.h> |
18 | 18 | ||
19 | #define NV_PMU_THERM_CMD_ID_RPC 0x00000002 | 19 | #define NV_PMU_THERM_CMD_ID_RPC 0x00000002 |
20 | #define NV_PMU_THERM_MSG_ID_RPC 0x00000002 | 20 | #define NV_PMU_THERM_MSG_ID_RPC 0x00000002 |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h index f0f1340e..bc2b4f52 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifthermsensor.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include "ctrl/ctrltherm.h" | 17 | #include "ctrl/ctrltherm.h" |
18 | #include "pmuif/gpmuifboardobj.h" | 18 | #include "pmuif/gpmuifboardobj.h" |
19 | #include "gk20a/pmu_common.h" | 19 | #include <nvgpu/flcnif_cmn.h> |
20 | 20 | ||
21 | #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_DEVICE 0x00 | 21 | #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_DEVICE 0x00 |
22 | #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_CHANNEL 0x01 | 22 | #define NV_PMU_THERM_BOARDOBJGRP_CLASS_ID_THERM_CHANNEL 0x01 |
diff --git a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h index 359b3a7a..b4dea724 100644 --- a/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h +++ b/drivers/gpu/nvgpu/pmuif/gpmuifvolt.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -14,7 +14,7 @@ | |||
14 | #define _GPMUIFVOLT_H_ | 14 | #define _GPMUIFVOLT_H_ |
15 | 15 | ||
16 | #include "pmuif/gpmuifboardobj.h" | 16 | #include "pmuif/gpmuifboardobj.h" |
17 | #include "gk20a/pmu_common.h" | 17 | #include <nvgpu/flcnif_cmn.h> |
18 | #include "ctrl/ctrlvolt.h" | 18 | #include "ctrl/ctrlvolt.h" |
19 | 19 | ||
20 | #define NV_PMU_VOLT_VALUE_0V_IN_UV (0) | 20 | #define NV_PMU_VOLT_VALUE_0V_IN_UV (0) |
diff --git a/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h b/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h index b21b3981..3724be2f 100644 --- a/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h +++ b/drivers/gpu/nvgpu/pmuif/nvgpu_gpmu_cmdif.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #define _NVGPUGPMUCMDIF_H_ | 14 | #define _NVGPUGPMUCMDIF_H_ |
15 | 15 | ||
16 | #include "gk20a/pmu_api.h" | 16 | #include "gk20a/pmu_api.h" |
17 | #include "gk20a/pmu_common.h" | 17 | #include <nvgpu/flcnif_cmn.h> |
18 | #include "gpmuif_cmn.h" | 18 | #include "gpmuif_cmn.h" |
19 | #include "gpmuif_pmu.h" | 19 | #include "gpmuif_pmu.h" |
20 | #include "gpmuifboardobj.h" | 20 | #include "gpmuifboardobj.h" |