From 7c166d238c1e1532b813c516df6aa33944eac298 Mon Sep 17 00:00:00 2001
From: Yash Bhatt <ybhatt@nvidia.com>
Date: Wed, 3 Apr 2024 11:49:20 +0000
Subject: [PATCH] video: tegra: nvmap: Deprecate nvmap_init_t19x.c

Remove file nvmap_init_t19x.c from nvmap as it was only relevant for
older devices.

Bug 4479027

Change-Id: I7b09d25bec299e47efe237720f641328e9f0d6da
Signed-off-by: Yash Bhatt <ybhatt@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3108671
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Ashish Mhetre <amhetre@nvidia.com>
Reviewed-by: Ketan Patil <ketanp@nvidia.com>
---
 drivers/video/tegra/nvmap/Makefile          |  6 +--
 drivers/video/tegra/nvmap/nvmap_init_t19x.c | 43 ---------------------
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 drivers/video/tegra/nvmap/nvmap_init_t19x.c

diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile
index 100c97c4..e24d3830 100644
--- a/drivers/video/tegra/nvmap/Makefile
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2023, NVIDIA CORPORATION.  All rights reserved.
+# Copyright (c) 2024, NVIDIA CORPORATION.  All rights reserved.
 
 GCOV_PROFILE := y
 
@@ -38,10 +38,6 @@ ifeq ($(NVMAP_CONFIG_PAGE_POOLS), y)
 nvmap-y += nvmap_pp.o
 endif #NVMAP_CONFIG_PAGE_POOLS
 
-ifneq ($(filter y,$(CONFIG_ARCH_TEGRA_19x_SOC) $(CONFIG_ARCH_TEGRA_194_SOC)),)
-nvmap-y += nvmap_init_t19x.o
-endif #CONFIG_ARCH_TEGRA_19x_SOC or CONFIG_ARCH_TEGRA_194_SOC
-
 KASAN_SANITIZE_nvmap_kasan_wrapper.o := n
 
 ifeq ($(NVMAP_CONFIG_LOADABLE_MODULE), y)
diff --git a/drivers/video/tegra/nvmap/nvmap_init_t19x.c b/drivers/video/tegra/nvmap/nvmap_init_t19x.c
deleted file mode 100644
index 9383accc..00000000
--- a/drivers/video/tegra/nvmap/nvmap_init_t19x.c
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (c) 2016-2023, NVIDIA CORPORATION.  All rights reserved.
- */
-
-#define pr_fmt(fmt)	"nvmap: %s() " fmt, __func__
-
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_reserved_mem.h>
-#include <linux/platform_device.h>
-#include <linux/nvmap_t19x.h>
-#include <linux/kobject.h>
-#include <linux/debugfs.h>
-#include <linux/sysfs.h>
-#include <linux/io.h>
-
-#include "nvmap_priv.h"
-
-int nvmap_register_cvsram_carveout(struct device *dma_dev,
-		phys_addr_t base, size_t size, int (*busy)(void),
-		int (*idle)(void))
-{
-	static struct nvmap_platform_carveout cvsram = {
-		.name = "cvsram",
-		.usage_mask = NVMAP_HEAP_CARVEOUT_CVSRAM,
-		.disable_dynamic_dma_map = true,
-		.no_cpu_access = true,
-	};
-
-	cvsram.pm_ops.busy = busy;
-	cvsram.pm_ops.idle = idle;
-
-	if (!base || !size || (base != PAGE_ALIGN(base)) ||
-	    (size != PAGE_ALIGN(size)))
-		return -EINVAL;
-	cvsram.base = base;
-	cvsram.size = size;
-
-	cvsram.dma_dev = &cvsram.dev;
-	return nvmap_create_carveout(&cvsram);
-}
-EXPORT_SYMBOL(nvmap_register_cvsram_carveout);