From 584f8bd83d014f6356937fc26354412743e7ca0c Mon Sep 17 00:00:00 2001 From: Praveen K Date: Wed, 14 Jul 2021 12:59:01 +0530 Subject: [PATCH] video: tegra: host: nvdla: Remove CONFIG_TEGRA_T23X_GRHOST checks - Remove CONFIG_TEGRA_T23X_GRHOST as linux-t23x repo is merged to linux-nvidia repo Bug 200751144 Change-Id: Ia2af1e924dd0033d13da9e1c7ea7ae03832ead43 Signed-off-by: Praveen K Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2558796 Reviewed-by: svc_kernel_abi Reviewed-by: Bharat Nihalani Reviewed-by: Amit Sharma (SW-TEGRA) Reviewed-by: Anup Mahindre Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/video/tegra/host/nvdla/Makefile | 8 +------- drivers/video/tegra/host/nvdla/nvdla.c | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/video/tegra/host/nvdla/Makefile b/drivers/video/tegra/host/nvdla/Makefile index 1e10abfd..d69820df 100644 --- a/drivers/video/tegra/host/nvdla/Makefile +++ b/drivers/video/tegra/host/nvdla/Makefile @@ -2,6 +2,7 @@ GCOV_PROFILE := y ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host ccflags-y += -I$(srctree.nvidia)/include ccflags-y += -I$(srctree.nvidia)/include/uapi/linux +ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/nvdla ccflags-y += -Werror nvhost-nvdla-objs = \ @@ -13,10 +14,3 @@ nvhost-nvdla-objs = \ nvdla_debug.o obj-$(CONFIG_TEGRA_GRHOST_NVDLA) += nvhost-nvdla.o - -ifdef CONFIG_TEGRA_T23X_GRHOST - -ccflags-y += -I$(srctree.nvidia-t23x)/drivers/video/tegra/host -ccflags-y += -I$(srctree.nvidia-t23x)/drivers/video/tegra/host/nvdla - -endif diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c index f29af1d2..81356ec1 100644 --- a/drivers/video/tegra/host/nvdla/nvdla.c +++ b/drivers/video/tegra/host/nvdla/nvdla.c @@ -40,9 +40,7 @@ #include "nvhost_gos.h" #include "t194/t194.h" -#ifdef CONFIG_TEGRA_T23X_GRHOST #include "t23x/t23x.h" -#endif #include "nvdla/nvdla.h" #include "nvdla/dla_queue.h" @@ -772,7 +770,6 @@ static struct of_device_id tegra_nvdla_of_match[] = { .name = "nvdla1", .compatible = "nvidia,tegra194-nvdla", .data = (struct nvhost_device_data *)&t19_nvdla1_info }, -#ifdef CONFIG_TEGRA_T23X_GRHOST { .name = "nvdla0", .compatible = "nvidia,tegra234-nvdla", @@ -781,7 +778,6 @@ static struct of_device_id tegra_nvdla_of_match[] = { .name = "nvdla1", .compatible = "nvidia,tegra234-nvdla", .data = (struct nvhost_device_data *)&t23x_nvdla1_info }, -#endif { }, };