From 2d2fc21cec4aa2d4600321c114bc223de3978035 Mon Sep 17 00:00:00 2001
From: Mahesh Kumar <mahkumar@nvidia.com>
Date: Wed, 9 Oct 2024 09:27:36 +0000
Subject: [PATCH] platform: dce: move hw headers to soc folder

This patch moves HW headers to SOC-specific subfolder to avoid conflict.

Jira TDS-15438

Change-Id: I45796dbe445319dd5d71a304732e11c858135345
Signed-off-by: Mahesh Kumar <mahkumar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3227902
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
---
 drivers/platform/tegra/dce/dce-hsp-smb.c                     | 1 +
 drivers/platform/tegra/dce/dce-hsp-ss.c                      | 1 +
 drivers/platform/tegra/dce/include/dce-regs.h                | 5 +----
 .../platform/tegra/dce/include/hw/{ => t234}/hw_hsp_dce.h    | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename drivers/platform/tegra/dce/include/hw/{ => t234}/hw_hsp_dce.h (98%)

diff --git a/drivers/platform/tegra/dce/dce-hsp-smb.c b/drivers/platform/tegra/dce/dce-hsp-smb.c
index b90f62df..b239f1a2 100644
--- a/drivers/platform/tegra/dce/dce-hsp-smb.c
+++ b/drivers/platform/tegra/dce/dce-hsp-smb.c
@@ -7,6 +7,7 @@
 #include <dce-log.h>
 #include <dce-util-common.h>
 #include <dce-hsp-t234.h>
+#include <hw/t234/hw_hsp_dce.h>
 
 /**
  * smb_regs is a 2D array of read-only pointers to a function returning u32.
diff --git a/drivers/platform/tegra/dce/dce-hsp-ss.c b/drivers/platform/tegra/dce/dce-hsp-ss.c
index 6aa5f574..7fdf011c 100644
--- a/drivers/platform/tegra/dce/dce-hsp-ss.c
+++ b/drivers/platform/tegra/dce/dce-hsp-ss.c
@@ -7,6 +7,7 @@
 #include <dce-log.h>
 #include <dce-util-common.h>
 #include <dce-hsp-t234.h>
+#include <hw/t234/hw_hsp_dce.h>
 
 /**
  * ss_set_regs is a 2D array of read-only pointers to a function returning u32.
diff --git a/drivers/platform/tegra/dce/include/dce-regs.h b/drivers/platform/tegra/dce/include/dce-regs.h
index cf23e57f..0a502ba5 100644
--- a/drivers/platform/tegra/dce/include/dce-regs.h
+++ b/drivers/platform/tegra/dce/include/dce-regs.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.  All rights reserved.
  */
 
 #ifndef DCE_REGS_H
@@ -9,9 +9,6 @@
 
 #include <hw/hw_evp_dce.h>
 #include <hw/hw_ast_dce.h>
-#include <hw/hw_hsp_dce.h>
 #include <hw/hw_pm_dce.h>
 
-#define DCE_MAX_HSP	3
-
 #endif /* DCE_REGS_H */
diff --git a/drivers/platform/tegra/dce/include/hw/hw_hsp_dce.h b/drivers/platform/tegra/dce/include/hw/t234/hw_hsp_dce.h
similarity index 98%
rename from drivers/platform/tegra/dce/include/hw/hw_hsp_dce.h
rename to drivers/platform/tegra/dce/include/hw/t234/hw_hsp_dce.h
index eeba6dca..898f07b4 100644
--- a/drivers/platform/tegra/dce/include/hw/hw_hsp_dce.h
+++ b/drivers/platform/tegra/dce/include/hw/t234/hw_hsp_dce.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * Copyright (c) 2019-2023, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2019-2024, NVIDIA CORPORATION.  All rights reserved.
  */
 /*
  * Function naming determines intended use: