From 78ad8a23ea896abde95f76b2ced0fe353cb4cb60 Mon Sep 17 00:00:00 2001
From: Alex Waterman <alexw@nvidia.com>
Date: Fri, 28 Oct 2016 18:03:55 -0700
Subject: gpu: nvgpu: Move gp106 HW headers

Move the gp106 HW headers to a new directory specially for them:

  include/nvgpu/hw/gp106

And change the code to include like so:

  #include <nvgpu/hw/gp106/hw_fb_gp106.h>

This is part of the process to restructure the nvgpu driver.

Bug 1799159

Change-Id: I76a4ff2e92021150ce65a8843bc12bb614a0e68a
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1280327
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/clk/clk_mclk.c | 13 ++++++++-----
 drivers/gpu/nvgpu/clk/clk_vin.c  | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

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

diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index cf95f4c5..0f191b6f 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -11,17 +11,20 @@
  * more details.
  */
 
-#include "gk20a/gk20a.h"
 #include <linux/delay.h>
-#include "pmuif/gpmuifseq.h"
-#include "gm206/bios_gm206.h"
+
+#include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
 
-#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
-#include "gp106/hw_fb_gp106.h"
+#include "pmuif/gpmuifseq.h"
+
+#include "gm206/bios_gm206.h"
 
 #include "include/bios.h"
 
+#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
+#include <nvgpu/hw/gp106/hw_fb_gp106.h>
+
 #define VREG_COUNT 24
 
 struct memory_link_training_pattern {
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c
index 649eb234..e2a209ee 100644
--- a/drivers/gpu/nvgpu/clk/clk_vin.c
+++ b/drivers/gpu/nvgpu/clk/clk_vin.c
@@ -12,17 +12,25 @@
  */
 
 #include "gk20a/gk20a.h"
-#include "clk.h"
-#include "clk_vin.h"
+
 #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/ctrlvolt.h"
+
+#include "gm206/bios_gm206.h"
 #include "gk20a/pmu_gk20a.h"
-#include "gp106/hw_fuse_gp106.h"
+
+#include "clk.h"
+#include "clk_vin.h"
+
+
+#include <nvgpu/hw/gp106/hw_fuse_gp106.h>
 
 static u32 devinit_get_vin_device_table(struct gk20a *g,
 		struct avfsvinobjs *pvinobjs);
-- 
cgit v1.2.2