diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-06-19 17:17:03 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-20 22:14:15 -0400 |
commit | d0ea8fe969b2a8f7509621103c1ead83187b798b (patch) | |
tree | b95eb51dffcdfff4510e7980a031721a057931f7 | |
parent | 7437fefa9016ab8904c79f521276f5c41e40c449 (diff) |
gpu: nvgpu: Merge tegra/linux to common/linux
tegra/linux path was created to separate Tegra kernel specific
dependencies from common Linux specific dependencies. The split has
not really worked, so merge tegra/linux to common/linux.
JIRA NVGPU-38
Change-Id: I582e12a0a8b5de62a29e41a37f4f8b8caae955fc
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1505178
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.nvgpu | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/clk.c (renamed from drivers/gpu/nvgpu/tegra/linux/clk.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/clk.h (renamed from drivers/gpu/nvgpu/tegra/linux/clk.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c (renamed from drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h (renamed from drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c (renamed from drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h (renamed from drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.h) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index 790cd656..250acc15 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu | |||
@@ -134,7 +134,7 @@ nvgpu-$(CONFIG_DEBUG_FS) += \ | |||
134 | common/linux/debug_kmem.o \ | 134 | common/linux/debug_kmem.o \ |
135 | common/linux/debug_clk.o | 135 | common/linux/debug_clk.o |
136 | 136 | ||
137 | nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gk20a_tegra.o | 137 | nvgpu-$(CONFIG_TEGRA_GK20A) += common/linux/platform_gk20a_tegra.o |
138 | nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o | 138 | nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o |
139 | nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o | 139 | nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o |
140 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost.o | 140 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost.o |
@@ -160,7 +160,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | |||
160 | vgpu/sysfs_vgpu.o | 160 | vgpu/sysfs_vgpu.o |
161 | 161 | ||
162 | nvgpu-$(CONFIG_COMMON_CLK) += \ | 162 | nvgpu-$(CONFIG_COMMON_CLK) += \ |
163 | tegra/linux/clk.o | 163 | common/linux/clk.o |
164 | 164 | ||
165 | nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ | 165 | nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ |
166 | gk20a/gk20a_scale.o | 166 | gk20a/gk20a_scale.o |
@@ -235,7 +235,7 @@ nvgpu-y += \ | |||
235 | lpwr/rppg.o \ | 235 | lpwr/rppg.o \ |
236 | lpwr/lpwr.o | 236 | lpwr/lpwr.o |
237 | 237 | ||
238 | nvgpu-$(CONFIG_TEGRA_GK20A) += tegra/linux/platform_gp10b_tegra.o | 238 | nvgpu-$(CONFIG_TEGRA_GK20A) += common/linux/platform_gp10b_tegra.o |
239 | 239 | ||
240 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | 240 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ |
241 | vgpu/gp10b/vgpu_hal_gp10b.o \ | 241 | vgpu/gp10b/vgpu_hal_gp10b.o \ |
diff --git a/drivers/gpu/nvgpu/tegra/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c index 775e5661..775e5661 100644 --- a/drivers/gpu/nvgpu/tegra/linux/clk.c +++ b/drivers/gpu/nvgpu/common/linux/clk.c | |||
diff --git a/drivers/gpu/nvgpu/tegra/linux/clk.h b/drivers/gpu/nvgpu/common/linux/clk.h index 614a7fd7..614a7fd7 100644 --- a/drivers/gpu/nvgpu/tegra/linux/clk.h +++ b/drivers/gpu/nvgpu/common/linux/clk.h | |||
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c index b0f6ee7d..b0f6ee7d 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | |||
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h index 1aa7c1e3..1aa7c1e3 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h | |||
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c index 5980c592..5980c592 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c | |||
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.h b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h index 74db60d1..74db60d1 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.h +++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h | |||