From 686c3b701fb1db75a0b416a25c288c04a396df31 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Thu, 2 Feb 2017 15:10:57 -0800
Subject: [PATCH] gpu: nvgpu: Move platform files to Tegra Linux

Platform files are used for adding code to probe for Tegra Linux
platform. Move the files to Tegra Linux directory to make this
clear.

Change-Id: Ida66af835688325f095260c618dad90395851267
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1300112
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
---
 drivers/gpu/nvgpu/Makefile.nvgpu                          | 4 ++--
 .../nvgpu/{gk20a => tegra/linux}/platform_gk20a_tegra.c   | 8 ++++----
 .../nvgpu/{gp10b => tegra/linux}/platform_gp10b_tegra.c   | 4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename drivers/gpu/nvgpu/{gk20a => tegra/linux}/platform_gk20a_tegra.c (99%)
 rename drivers/gpu/nvgpu/{gp10b => tegra/linux}/platform_gp10b_tegra.c (99%)

diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu
index 6e6f79d9b..00b4a2916 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -90,7 +90,7 @@ nvgpu-y := \
 	boardobj/boardobjgrp_e255.o \
 	boardobj/boardobjgrp_e32.o
 
-nvgpu-$(CONFIG_TEGRA_GK20A) += gk20a/platform_gk20a_tegra.o
+nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gk20a_tegra.o
 nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o
 nvgpu-$(CONFIG_GK20A_PCI) += pci.o
 
@@ -192,7 +192,7 @@ nvgpu-y += \
 	lpwr/rppg.o \
 	lpwr/lpwr.o
 
-nvgpu-$(CONFIG_TEGRA_GK20A) += gp10b/platform_gp10b_tegra.o
+nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gp10b_tegra.o
 
 nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
 	vgpu/gp10b/vgpu_hal_gp10b.o  \
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
similarity index 99%
rename from drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
rename to drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index 225b98e47..56ba1ecdf 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -43,10 +43,10 @@
 
 #include <linux/platform/tegra/tegra_emc.h>
 
-#include "gk20a.h"
-#include "hal_gk20a.h"
-#include "platform_gk20a.h"
-#include "gk20a_scale.h"
+#include "gk20a/gk20a.h"
+#include "gk20a/hal_gk20a.h"
+#include "gk20a/platform_gk20a.h"
+#include "gk20a/gk20a_scale.h"
 #include "gm20b/clk_gm20b.h"
 
 #define TEGRA_GK20A_BW_PER_FREQ 32
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
similarity index 99%
rename from drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
rename to drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
index 3a2324025..f0c3640a4 100644
--- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
@@ -34,9 +34,7 @@
 #include "gk20a/gk20a_scale.h"
 
 #include "platform_tegra.h"
-#include "gr_gp10b.h"
-#include "ltc_gp10b.h"
-#include "gp10b_sysfs.h"
+#include "gp10b/gp10b_sysfs.h"
 
 #include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>