gpu: nvgpu: move pmuif/* to drivers/gpu/nvgpu/include/nvgpu

Moved pmuif/* headers to drivers/gpu/nvgpu/include/nvgpu folder to support cross platform feature implementation. Made changes to files which accessed include pmuif/* to reflect pmuif/* movement changes. Deleted includes of gk20a.h/pmu_gk20a.h from pmuif/*.h files. Jira NVGPU-19 Change-Id: Iace4e107c24bdaff08a407eae3b147959173e485 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: http://git-master/r/1299823 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
author: Mahantesh Kumbar <mkumbar@nvidia.com> 2017-02-06 06:19:24 -0500
committer: mobile promotions <svcmobile_promotions@nvidia.com> 2017-02-10 12:43:46 -0500
commit: 3885fe099af0bda910ac8ee64f2cd1a5bbea3ab0 (patch)
tree: 602ead38e7631ce81db7e600802fdac0aba49974 /drivers/gpu/nvgpu/clk
parent: 8da422ac577338ecb2d4114e1d8d5f36cf4cab78 (diff)
12 files changed, 17 insertions, 31 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c
index ecd53c02..e809b5e9 100644
--- a/drivers/gpu/nvgpu/clk/clk.c
+++ b/drivers/gpu/nvgpu/clk/clk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -13,8 +13,7 @@
 #include "gk20a/gk20a.h"
 #include "clk.h"
-#include "pmuif/gpmuifclk.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "pmuif/gpmuifvolt.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
 #include "volt/volt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c
index 892437de..b53d3708 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.c
+++ b/drivers/gpu/nvgpu/clk/clk_domain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -18,8 +18,6 @@
 #include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
-#include "pmuif/gpmuifclk.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h
index 443e1c4c..532b7ca5 100644
--- a/drivers/gpu/nvgpu/clk/clk_domain.h
+++ b/drivers/gpu/nvgpu/clk/clk_domain.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -16,7 +16,7 @@
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
-#include "pmuif/gpmuifclk.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp_e32.h"
 #include "boardobj/boardobjgrpmask.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c
index d83f3e15..91cd0e20 100644
--- a/drivers/gpu/nvgpu/clk/clk_fll.c
+++ b/drivers/gpu/nvgpu/clk/clk_fll.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -17,8 +17,6 @@
 #include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
-#include "pmuif/gpmuifclk.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h
index 06872f48..89415b4b 100644
--- a/drivers/gpu/nvgpu/clk/clk_fll.h
+++ b/drivers/gpu/nvgpu/clk/clk_fll.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -14,7 +14,7 @@
 #ifndef _CLKFLL_H_
 #define _CLKFLL_H_
-#include "pmuif/gpmuifclk.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp_e32.h"
 #include "boardobj/boardobjgrpmask.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c
index 17f79168..6fa2db5a 100644
--- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c
+++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -19,8 +19,6 @@
 #include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
-#include "pmuif/gpmuifclk.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index 0f191b6f..479fbb0e 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -15,9 +15,7 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "pmuif/gpmuifseq.h"
 #include "gm206/bios_gm206.h"
 #include "include/bios.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c
index 4135f767..38654b66 100644
--- a/drivers/gpu/nvgpu/clk/clk_prog.c
+++ b/drivers/gpu/nvgpu/clk/clk_prog.c
@@ -18,8 +18,6 @@
 #include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
-#include "pmuif/gpmuifclk.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h
index 541f04cb..e392870b 100644
--- a/drivers/gpu/nvgpu/clk/clk_prog.h
+++ b/drivers/gpu/nvgpu/clk/clk_prog.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -15,7 +15,7 @@
 #define _CLKPROG_H_
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
-#include "pmuif/gpmuifclk.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp_e32.h"
 #include "boardobj/boardobjgrp_e255.h"
 #include "boardobj/boardobjgrpmask.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c
index 4fde7226..58eeb6c2 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.c
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -17,8 +17,6 @@
 #include "include/bios.h"
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
-#include "pmuif/gpmuifclk.h"
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h
index 15920066..8c4fdecd 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.h
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms and conditions of the GNU General Public License,
@@ -15,7 +15,7 @@
 #define _CLKVFPOINT_H_
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlboardobj.h"
-#include "pmuif/gpmuifclk.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "boardobj/boardobjgrp_e32.h"
 #include "boardobj/boardobjgrpmask.h"
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index 1ababe55..13358335 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -18,8 +18,7 @@
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
-#include "pmuif/gpmuifboardobj.h"
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-#include "pmuif/gpmuifclk.h"
 #include "ctrl/ctrlvolt.h"
author	Mahantesh Kumbar <mkumbar@nvidia.com>	2017-02-06 06:19:24 -0500
committer	mobile promotions <svcmobile_promotions@nvidia.com>	2017-02-10 12:43:46 -0500
commit	3885fe099af0bda910ac8ee64f2cd1a5bbea3ab0 (patch)
tree	602ead38e7631ce81db7e600802fdac0aba49974 /drivers/gpu/nvgpu/clk
parent	8da422ac577338ecb2d4114e1d8d5f36cf4cab78 (diff)

diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c index ecd53c02..e809b5e9 100644 --- a/drivers/gpu/nvgpu/clk/clk.c +++ b/drivers/gpu/nvgpu/clk/clk.c
@@ -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,8 +13,7 @@
13		13
14	#include "gk20a/gk20a.h"	14	#include "gk20a/gk20a.h"
15	#include "clk.h"	15	#include "clk.h"
16	#include "pmuif/gpmuifclk.h"	16	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
17	#include "pmuif/gpmuifvolt.h"
18	#include "ctrl/ctrlclk.h"	17	#include "ctrl/ctrlclk.h"
19	#include "ctrl/ctrlvolt.h"	18	#include "ctrl/ctrlvolt.h"
20	#include "volt/volt.h"	19	#include "volt/volt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 892437de..b53d3708 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c
@@ -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,
@@ -18,8 +18,6 @@
18	#include "include/bios.h"	18	#include "include/bios.h"
19	#include "boardobj/boardobjgrp.h"	19	#include "boardobj/boardobjgrp.h"
20	#include "boardobj/boardobjgrp_e32.h"	20	#include "boardobj/boardobjgrp_e32.h"
21	#include "pmuif/gpmuifboardobj.h"
22	#include "pmuif/gpmuifclk.h"
23	#include "gm206/bios_gm206.h"	21	#include "gm206/bios_gm206.h"
24	#include "ctrl/ctrlclk.h"	22	#include "ctrl/ctrlclk.h"
25	#include "ctrl/ctrlvolt.h"	23	#include "ctrl/ctrlvolt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h index 443e1c4c..532b7ca5 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.h +++ b/drivers/gpu/nvgpu/clk/clk_domain.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/ctrlclk.h"	17	#include "ctrl/ctrlclk.h"
18	#include "ctrl/ctrlboardobj.h"	18	#include "ctrl/ctrlboardobj.h"
19	#include "pmuif/gpmuifclk.h"	19	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
20	#include "boardobj/boardobjgrp_e32.h"	20	#include "boardobj/boardobjgrp_e32.h"
21	#include "boardobj/boardobjgrpmask.h"	21	#include "boardobj/boardobjgrpmask.h"
22		22


diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index d83f3e15..91cd0e20 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c
@@ -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,8 +17,6 @@
17	#include "include/bios.h"	17	#include "include/bios.h"
18	#include "boardobj/boardobjgrp.h"	18	#include "boardobj/boardobjgrp.h"
19	#include "boardobj/boardobjgrp_e32.h"	19	#include "boardobj/boardobjgrp_e32.h"
20	#include "pmuif/gpmuifboardobj.h"
21	#include "pmuif/gpmuifclk.h"
22	#include "gm206/bios_gm206.h"	20	#include "gm206/bios_gm206.h"
23	#include "ctrl/ctrlclk.h"	21	#include "ctrl/ctrlclk.h"
24	#include "ctrl/ctrlvolt.h"	22	#include "ctrl/ctrlvolt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h index 06872f48..89415b4b 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.h +++ b/drivers/gpu/nvgpu/clk/clk_fll.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 _CLKFLL_H_	14	#ifndef _CLKFLL_H_
15	#define _CLKFLL_H_	15	#define _CLKFLL_H_
16		16
17	#include "pmuif/gpmuifclk.h"	17	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
18	#include "boardobj/boardobjgrp_e32.h"	18	#include "boardobj/boardobjgrp_e32.h"
19	#include "boardobj/boardobjgrpmask.h"	19	#include "boardobj/boardobjgrpmask.h"
20		20


diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index 17f79168..6fa2db5a 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c
@@ -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,
@@ -19,8 +19,6 @@
19	#include "include/bios.h"	19	#include "include/bios.h"
20	#include "boardobj/boardobjgrp.h"	20	#include "boardobj/boardobjgrp.h"
21	#include "boardobj/boardobjgrp_e32.h"	21	#include "boardobj/boardobjgrp_e32.h"
22	#include "pmuif/gpmuifboardobj.h"
23	#include "pmuif/gpmuifclk.h"
24	#include "gm206/bios_gm206.h"	22	#include "gm206/bios_gm206.h"
25	#include "ctrl/ctrlclk.h"	23	#include "ctrl/ctrlclk.h"
26	#include "ctrl/ctrlvolt.h"	24	#include "ctrl/ctrlvolt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index 0f191b6f..479fbb0e 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright (c) 2014-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,
@@ -15,9 +15,7 @@
15		15
16	#include "gk20a/gk20a.h"	16	#include "gk20a/gk20a.h"
17	#include "gk20a/pmu_gk20a.h"	17	#include "gk20a/pmu_gk20a.h"
18		18	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
19	#include "pmuif/gpmuifseq.h"
20
21	#include "gm206/bios_gm206.h"	19	#include "gm206/bios_gm206.h"
22		20
23	#include "include/bios.h"	21	#include "include/bios.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 4135f767..38654b66 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c
@@ -18,8 +18,6 @@
18	#include "include/bios.h"	18	#include "include/bios.h"
19	#include "boardobj/boardobjgrp.h"	19	#include "boardobj/boardobjgrp.h"
20	#include "boardobj/boardobjgrp_e32.h"	20	#include "boardobj/boardobjgrp_e32.h"
21	#include "pmuif/gpmuifboardobj.h"
22	#include "pmuif/gpmuifclk.h"
23	#include "gm206/bios_gm206.h"	21	#include "gm206/bios_gm206.h"
24	#include "ctrl/ctrlclk.h"	22	#include "ctrl/ctrlclk.h"
25	#include "ctrl/ctrlvolt.h"	23	#include "ctrl/ctrlvolt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h index 541f04cb..e392870b 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.h +++ b/drivers/gpu/nvgpu/clk/clk_prog.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,
@@ -15,7 +15,7 @@
15	#define _CLKPROG_H_	15	#define _CLKPROG_H_
16	#include "ctrl/ctrlclk.h"	16	#include "ctrl/ctrlclk.h"
17	#include "ctrl/ctrlboardobj.h"	17	#include "ctrl/ctrlboardobj.h"
18	#include "pmuif/gpmuifclk.h"	18	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
19	#include "boardobj/boardobjgrp_e32.h"	19	#include "boardobj/boardobjgrp_e32.h"
20	#include "boardobj/boardobjgrp_e255.h"	20	#include "boardobj/boardobjgrp_e255.h"
21	#include "boardobj/boardobjgrpmask.h"	21	#include "boardobj/boardobjgrpmask.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 4fde7226..58eeb6c2 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c
@@ -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,8 +17,6 @@
17	#include "include/bios.h"	17	#include "include/bios.h"
18	#include "boardobj/boardobjgrp.h"	18	#include "boardobj/boardobjgrp.h"
19	#include "boardobj/boardobjgrp_e32.h"	19	#include "boardobj/boardobjgrp_e32.h"
20	#include "pmuif/gpmuifboardobj.h"
21	#include "pmuif/gpmuifclk.h"
22	#include "gm206/bios_gm206.h"	20	#include "gm206/bios_gm206.h"
23	#include "ctrl/ctrlclk.h"	21	#include "ctrl/ctrlclk.h"
24	#include "ctrl/ctrlvolt.h"	22	#include "ctrl/ctrlvolt.h"


diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index 15920066..8c4fdecd 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.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,
@@ -15,7 +15,7 @@
15	#define _CLKVFPOINT_H_	15	#define _CLKVFPOINT_H_
16	#include "ctrl/ctrlclk.h"	16	#include "ctrl/ctrlclk.h"
17	#include "ctrl/ctrlboardobj.h"	17	#include "ctrl/ctrlboardobj.h"
18	#include "pmuif/gpmuifclk.h"	18	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
19	#include "boardobj/boardobjgrp_e32.h"	19	#include "boardobj/boardobjgrp_e32.h"
20	#include "boardobj/boardobjgrpmask.h"	20	#include "boardobj/boardobjgrpmask.h"
21		21


diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 1ababe55..13358335 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -18,8 +18,7 @@
18	#include "boardobj/boardobjgrp.h"	18	#include "boardobj/boardobjgrp.h"
19	#include "boardobj/boardobjgrp_e32.h"	19	#include "boardobj/boardobjgrp_e32.h"
20		20
21	#include "pmuif/gpmuifboardobj.h"	21	#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
22	#include "pmuif/gpmuifclk.h"
23		22
24	#include "ctrl/ctrlvolt.h"	23	#include "ctrl/ctrlvolt.h"
25		24