From 9e5208f6348a5d3a57265971315185dadf0916f6 Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Wed, 18 Jan 2017 18:30:58 +0530
Subject: drivers: gpu: nvgpu: Use soc/tegra/fuse.h for fuse header

The fuse headers are unified and moved all the content of
linux/tegra-fuse.h to the soc/tegra/fuse.h to have the
single fuse header for Tegra.

Use unified fuse header soc/tegra/fuse.h.

bug 200260692

Change-Id: Icab3ba5c3dbcd3fa831455c2f336942d356ff5ac
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/1287498
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/gm206/gr_gm206.c  | 2 +-
 drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 +---
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c  | 2 +-
 drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +-
 drivers/gpu/nvgpu/gm20b/pmu_gm20b.c | 2 +-
 drivers/gpu/nvgpu/gp106/clk_gp106.c | 2 +-
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c  | 2 +-
 drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +-
 drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 2 +-
 9 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'drivers/gpu/nvgpu')

diff --git a/drivers/gpu/nvgpu/gm206/gr_gm206.c b/drivers/gpu/nvgpu/gm206/gr_gm206.c
index 782eda8b..b7956eca 100644
--- a/drivers/gpu/nvgpu/gm206/gr_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/gr_gm206.c
@@ -16,8 +16,8 @@
 #include <linux/types.h>
 #include <linux/delay.h>	/* for mdelay */
 #include <linux/io.h>
-#include <linux/tegra-fuse.h>
 #include <linux/vmalloc.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index c50b76b3..05dd455c 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -23,11 +23,9 @@
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/clk/tegra.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 #include <soc/tegra/fuse.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 #include <soc/tegra/tegra-dvfs.h>
-#else
-#include <linux/tegra-fuse.h>
 #endif
 
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 41532dc5..0df2845f 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -16,9 +16,9 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/tegra-fuse.h>
 #include <linux/vmalloc.h>
 #include <linux/version.h>
+#include <soc/tegra/fuse.h>
 
 #include <dt-bindings/soc/gm20b-fuse.h>
 
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 83d9c645..e036215f 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -15,7 +15,7 @@
 
 #include <linux/types.h>
 #include <linux/version.h>
-#include <linux/tegra-fuse.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
index 3c09600d..38509f69 100644
--- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/delay.h>	/* for udelay */
-#include <linux/tegra-fuse.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 709527e3..edeb97ec 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -22,7 +22,7 @@
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
 #include <linux/clk/tegra.h>
-#include <linux/tegra-fuse.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 7eceb2a4..84482d68 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -15,9 +15,9 @@
 
 #include <linux/clk.h>
 #include <linux/delay.h>
-#include <linux/tegra-fuse.h>
 #include <linux/version.h>
 #include <linux/vmalloc.h>
+#include <soc/tegra/fuse.h>
 
 #include <dt-bindings/soc/gm20b-fuse.h>
 #include <dt-bindings/soc/gp10b-fuse.h>
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index d6379374..5fa1ec85 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -17,7 +17,7 @@
 #include <linux/printk.h>
 #include <linux/version.h>
 #include <linux/types.h>
-#include <linux/tegra-fuse.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
index b385f11e..3837fa60 100644
--- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/delay.h>	/* for udelay */
-#include <linux/tegra-fuse.h>
+#include <soc/tegra/fuse.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
-- 
cgit v1.2.2