video: tegra: host: moving T239 to private repo

This patch takes care of moving NvHost changes related to T239
to it's dedicated repo.

Jira HOSTX-2908
Jira HOSTX-2950

Change-Id: I0faa9b427c41c1f9970076cbf7602bbe5ed27a2a
Signed-off-by: Santosh B S <santoshb@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2554027
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/video/tegra/host/Kconfig

@@ -7,6 +7,13 @@ config TEGRA_T23X_GRHOST
 	help
 	  Driver for the Tegra graphics host hardware.
 
+config TEGRA_T239_GRHOST
+	bool "Tegra 239 graphics host driver"
+	depends on TEGRA_GRHOST && ARCH_TEGRA_239_SOC
+	default y
+	help
+	  Driver for the Tegra graphics host hardware.
+
 config TEGRA_GRHOST_NVDLA
 	bool "Tegra NVDLA support"
 	depends on TEGRA_GRHOST && (ARCH_TEGRA_19x_SOC || ARCH_TEGRA_194_SOC)

drivers/video/tegra/host/Makefile

@@ -6,6 +6,11 @@ ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/devfreq
 ccflags-y += -Wno-multichar
 
+ifeq ($(CONFIG_TEGRA_T239_GRHOST),y)
+	ccflags-y += -I$(srctree.nvidia-t239)/include
+	ccflags-y += -I$(srctree.nvidia-t239)/drivers/video/tegra/host
+endif
+
 ccflags-y += -Werror -Wno-vla
 
 nvhost-y += \
@@ -32,9 +37,11 @@ nvhost-y += \
 
 nvhost-$(CONFIG_TEGRA_T23X_GRHOST) += \
 	t23x/t23x.o \
-	t239/t239.o \
 	riscv/riscv.o
 
+nvhost-$(CONFIG_TEGRA_T239_GRHOST) += \
+	t239/t239.o
+
 nvhost-$(CONFIG_TEGRA_GRHOST_OFA) += ofa/ofa.o
 
 nvhost-$(CONFIG_TEGRA_GRHOST_NVDEC) += nvdec/nvdec.o

drivers/video/tegra/host/flcn/flcn.c

@@ -50,6 +50,8 @@
 #include "t194/t194.h"
 #ifdef CONFIG_TEGRA_T23X_GRHOST
 #include "t23x/t23x.h"
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
 #include "t239/t239.h"
 #endif
 
@@ -706,7 +708,10 @@ static struct of_device_id tegra_flcn_of_match[] = {
 		.data = (struct nvhost_device_data *)&t19_nvjpg_info },
 #endif
 #ifdef CONFIG_TEGRA_T23X_GRHOST
-#include "flcn/flcn_t23x.h"
+	#include "flcn/flcn_t23x.h"
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
+	#include "flcn/flcn_of_match_t239.h"
 #endif
 	{ },
 };

drivers/video/tegra/host/flcn/flcn_t23x.h

@@ -13,16 +13,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * struct of_device_id initialization for T234 and T239
+ * struct of_device_id initialization for T234
  */
 
 //static struct of_device_id tegra_flcn_of_match[] = {
 
 #if defined(CONFIG_TEGRA_GRHOST_VIC)
 	{ .compatible = "nvidia,tegra234-vic",
 		.data = (struct nvhost_device_data *)&t23x_vic_info },
-	{ .compatible = "nvidia,tegra239-vic",
-		.data = (struct nvhost_device_data *)&t239_vic_info },
 #endif
 #if defined(CONFIG_TEGRA_GRHOST_NVJPG)
 	{ .compatible = "nvidia,tegra234-nvjpg",
@@ -36,15 +34,10 @@
 	{ .compatible = "nvidia,tegra234-nvenc",
 		.data = (struct nvhost_device_data *)&t23x_msenc_info,
 		.name = "nvenc" },
-	{ .compatible = "nvidia,tegra239-nvenc",
-		.data = (struct nvhost_device_data *)&t239_msenc_info,
-		.name = "nvenc" },
 #endif
 #if defined(CONFIG_TEGRA_GRHOST_OFA)
 	{ .compatible = "nvidia,tegra234-ofa",
 		.data = (struct nvhost_device_data *)&t23x_ofa_info },
-	{ .compatible = "nvidia,tegra239-ofa",
-		.data = (struct nvhost_device_data *)&t239_ofa_info },
 #endif
 
 //};

drivers/video/tegra/host/host1x/host1x.c

@@ -67,6 +67,8 @@
 #include "t194/t194.h"
 #ifdef CONFIG_TEGRA_T23X_GRHOST
 #include "t23x/t23x.h"
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
 #include "t239/t239.h"
 #endif
 
@@ -1016,7 +1018,17 @@ static struct of_device_id tegra_host1x_of_match[] = {
 		.compatible = "nvidia,tegra194-host1x-hv",
 		.data = (struct nvhost_device_data *)&t19_host1x_hv_info },
 #ifdef CONFIG_TEGRA_T23X_GRHOST
-	#include "host1x/host1x_of_match_t23x.h"
+	{ .name = "host1x",
+		.compatible = "nvidia,tegra234-host1x",
+		.data = (struct nvhost_device_data *)&t23x_host1x_info },
+	{ .name = "host1x",
+		.compatible = "nvidia,tegra234-host1x-hv",
+		.data = (struct nvhost_device_data *)&t23x_host1x_hv_info },
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
+	{ .name = "host1x",
+		.compatible = "nvidia,tegra239-host1x",
+		.data = (struct nvhost_device_data *)&t239_host1x_info },
 #endif
 	{ },
 };

drivers/video/tegra/host/nvdec/nvdec.c

@@ -60,6 +60,8 @@
 #include "t194/t194.h"
 #ifdef CONFIG_TEGRA_T23X_GRHOST
 #include "t23x/t23x.h"
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
 #include "t239/t239.h"
 #endif
 
@@ -473,7 +475,14 @@ static struct of_device_id tegra_nvdec_of_match[] = {
 		.data = (struct nvhost_device_data *)&t19_nvdec1_info,
 		.name = "nvdec1" },
 #ifdef CONFIG_TEGRA_T23X_GRHOST
-	#include "nvdec/nvdec_of_match_t23x.h"
+	{ .compatible = "nvidia,tegra234-nvdec",
+		.data = (struct nvhost_device_data *)&t23x_nvdec_info,
+		.name = "nvdec" },
+#endif
+#ifdef CONFIG_TEGRA_T239_GRHOST
+	{ .compatible = "nvidia,tegra239-nvdec",
+		.data = (struct nvhost_device_data *)&t239_nvdec_info,
+		.name = "nvdec" },
 #endif
 	{ },
 };