From 673dd971600b26131c0afdb221e13c080da022fd Mon Sep 17 00:00:00 2001
From: Mahantesh Kumbar <mkumbar@nvidia.com>
Date: Wed, 10 May 2017 20:35:24 +0530
Subject: 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>
---
 drivers/gpu/nvgpu/clk/clk.c                 | 5 +++--
 drivers/gpu/nvgpu/clk/clk_domain.c          | 1 -
 drivers/gpu/nvgpu/clk/clk_fll.c             | 1 -
 drivers/gpu/nvgpu/clk/clk_freq_controller.c | 1 -
 drivers/gpu/nvgpu/clk/clk_mclk.c            | 1 -
 drivers/gpu/nvgpu/clk/clk_prog.c            | 2 --
 drivers/gpu/nvgpu/clk/clk_vf_point.c        | 2 +-
 drivers/gpu/nvgpu/clk/clk_vin.c             | 4 +---
 8 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'drivers/gpu/nvgpu/clk')

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 @@
  * more details.
  */
 
+#include <nvgpu/pmu.h>
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
+
 #include "gk20a/gk20a.h"
 #include "clk.h"
-#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
 #include "volt/volt.h"
-#include "gk20a/pmu_gk20a.h"
 
 #define BOOT_GPC2CLK_MHZ  2581
 #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 @@
 #include "boardobj/boardobjgrp_e32.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
-#include "gk20a/pmu_gk20a.h"
 
 static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs);
 
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 @@
 #include "boardobj/boardobjgrp_e32.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
-#include "gk20a/pmu_gk20a.h"
 
 static u32 devinit_get_fll_device_table(struct gk20a *g,
 				   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 @@
 #include "boardobj/boardobjgrp_e32.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
-#include "gk20a/pmu_gk20a.h"
 
 static u32 clk_freq_controller_pmudatainit_super(struct gk20a *g,
 	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 @@
 #include <nvgpu/kmem.h>
 
 #include "gk20a/gk20a.h"
-#include "gk20a/pmu_gk20a.h"
 #ifdef CONFIG_DEBUG_FS
 #include "gk20a/platform_gk20a.h"
 #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 @@
  */
 
 #include <nvgpu/bios.h>
-
 #include <nvgpu/kmem.h>
 
 #include "gk20a/gk20a.h"
@@ -24,7 +23,6 @@
 #include "gm206/bios_gm206.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
-#include "gk20a/pmu_gk20a.h"
 
 static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs);
 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 @@
  * more details.
  */
 
+
 #include "gk20a/gk20a.h"
 #include "clk.h"
 #include "clk_vf_point.h"
@@ -18,7 +19,6 @@
 #include "boardobj/boardobjgrp_e32.h"
 #include "ctrl/ctrlclk.h"
 #include "ctrl/ctrlvolt.h"
-#include "gk20a/pmu_gk20a.h"
 
 static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj
 	*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 @@
  */
 
 #include <nvgpu/bios.h>
+#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 
 #include "gk20a/gk20a.h"
 
 #include "boardobj/boardobjgrp.h"
 #include "boardobj/boardobjgrp_e32.h"
 
-#include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
-
 #include "ctrl/ctrlvolt.h"
 
 #include "gm206/bios_gm206.h"
-#include "gk20a/pmu_gk20a.h"
 
 #include "clk.h"
 #include "clk_vin.h"
-- 
cgit v1.2.2