summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-02-02 18:10:57 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-16 14:48:24 -0400
commit686c3b701fb1db75a0b416a25c288c04a396df31 (patch)
tree5744d4f1d44378b1272ef675917f9b1afdc8ec3d
parent2821eb31e2363bcaf81266b52967c15827ecee04 (diff)
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
-rw-r--r--drivers/gpu/nvgpu/Makefile.nvgpu4
-rw-r--r--drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c (renamed from drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c)8
-rw-r--r--drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c (renamed from drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c)4
3 files changed, 7 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu
index 6e6f79d9..00b4a291 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -90,7 +90,7 @@ nvgpu-y := \
90 boardobj/boardobjgrp_e255.o \ 90 boardobj/boardobjgrp_e255.o \
91 boardobj/boardobjgrp_e32.o 91 boardobj/boardobjgrp_e32.o
92 92
93nvgpu-$(CONFIG_TEGRA_GK20A) += gk20a/platform_gk20a_tegra.o 93nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gk20a_tegra.o
94nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o 94nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o
95nvgpu-$(CONFIG_GK20A_PCI) += pci.o 95nvgpu-$(CONFIG_GK20A_PCI) += pci.o
96 96
@@ -192,7 +192,7 @@ nvgpu-y += \
192 lpwr/rppg.o \ 192 lpwr/rppg.o \
193 lpwr/lpwr.o 193 lpwr/lpwr.o
194 194
195nvgpu-$(CONFIG_TEGRA_GK20A) += gp10b/platform_gp10b_tegra.o 195nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gp10b_tegra.o
196 196
197nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ 197nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
198 vgpu/gp10b/vgpu_hal_gp10b.o \ 198 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
index 225b98e4..56ba1ecd 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -43,10 +43,10 @@
43 43
44#include <linux/platform/tegra/tegra_emc.h> 44#include <linux/platform/tegra/tegra_emc.h>
45 45
46#include "gk20a.h" 46#include "gk20a/gk20a.h"
47#include "hal_gk20a.h" 47#include "gk20a/hal_gk20a.h"
48#include "platform_gk20a.h" 48#include "gk20a/platform_gk20a.h"
49#include "gk20a_scale.h" 49#include "gk20a/gk20a_scale.h"
50#include "gm20b/clk_gm20b.h" 50#include "gm20b/clk_gm20b.h"
51 51
52#define TEGRA_GK20A_BW_PER_FREQ 32 52#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
index 3a232402..f0c3640a 100644
--- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
@@ -34,9 +34,7 @@
34#include "gk20a/gk20a_scale.h" 34#include "gk20a/gk20a_scale.h"
35 35
36#include "platform_tegra.h" 36#include "platform_tegra.h"
37#include "gr_gp10b.h" 37#include "gp10b/gp10b_sysfs.h"
38#include "ltc_gp10b.h"
39#include "gp10b_sysfs.h"
40 38
41#include <nvgpu/hw/gp10b/hw_gr_gp10b.h> 39#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
42#include <nvgpu/hw/gp10b/hw_ltc_gp10b.h> 40#include <nvgpu/hw/gp10b/hw_ltc_gp10b.h>