diff --git a/BUILD.bazel b/BUILD.bazel
index e1deb57a..94ea57e8 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -92,10 +92,10 @@ kernel_module(
         "drivers/media/platform/tegra/isc/isc_mgr.ko",
         "drivers/media/platform/tegra/isc/isc_pwm.ko",
         "drivers/media/platform/tegra/v4l2loopback/v4l2loopback.ko",
-        "drivers/memory/tegra/private-soc/mc-t26x.ko",
-        "drivers/memory/tegra/private-soc/mem-qual.ko",
-        "drivers/memory/tegra/private-soc/smmu-hwpm.ko",
-        "drivers/memory/tegra/private-soc/tegra264-mc-hwpm.ko",
+        "drivers/memory/tegra/mc-t26x.ko",
+        "drivers/memory/tegra/mem-qual.ko",
+        "drivers/memory/tegra/smmu-hwpm.ko",
+        "drivers/memory/tegra/tegra264-mc-hwpm.ko",
         "drivers/mfd/max77851.ko",
         "drivers/mfd/nvidia-vrs-pseq.ko",
         "drivers/misc/bluedroid_pm.ko",
diff --git a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,t264-smmu-hwpm.yaml b/Documentation/devicetree/bindings/memory/tegra/nvidia,t264-smmu-hwpm.yaml
similarity index 75%
rename from Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,t264-smmu-hwpm.yaml
rename to Documentation/devicetree/bindings/memory/tegra/nvidia,t264-smmu-hwpm.yaml
index b7d3fa7a..0e9b2221 100644
--- a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,t264-smmu-hwpm.yaml
+++ b/Documentation/devicetree/bindings/memory/tegra/nvidia,t264-smmu-hwpm.yaml
@@ -1,13 +1,5 @@
-# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 %YAML 1.2
 ---
@@ -22,7 +14,7 @@ maintainers:
 
 description: |
      the compatability = nvidia,t264-smmu-hwpm is mentioned in the following drivers
-        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/private-soc/smmu-hwpm.c
+        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/smmu-hwpm.c
 
      The following nodes use this compatibility
         - /bus@0/smmu-hwpm@810aa30000
diff --git a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mc-hwpm.yaml b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mc-hwpm.yaml
similarity index 80%
rename from Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mc-hwpm.yaml
rename to Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mc-hwpm.yaml
index 504ca77e..bbe599b9 100644
--- a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mc-hwpm.yaml
+++ b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mc-hwpm.yaml
@@ -1,13 +1,5 @@
-# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 %YAML 1.2
 ---
@@ -22,7 +14,7 @@ maintainers:
 
 description: |
      the compatability = nvidia,tegra-t264-mc-hwpm is mentioned in the following drivers
-        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/private-soc/tegra264-mc-hwpm.c
+        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/tegra264-mc-hwpm.c
 
      The following nodes use this compatibility
         - /bus@0/memory-controller-hwpm@8108020000
diff --git a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mem-qual.yaml b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mem-qual.yaml
similarity index 80%
rename from Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mem-qual.yaml
rename to Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mem-qual.yaml
index af6ded55..a647c799 100644
--- a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t264-mem-qual.yaml
+++ b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t264-mem-qual.yaml
@@ -1,13 +1,5 @@
-# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 %YAML 1.2
 ---
@@ -21,7 +13,7 @@ maintainers:
 
 description: |
      the compatability = nvidia,tegra-t264-mem-qual is mentioned in the following drivers
-        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/private-soc/mem-qual.c
+        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/mem-qual.c
 
      The following nodes use this compatibility
         - /bus@0/memqual@f020000
diff --git a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t26x-mc.yaml b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t26x-mc.yaml
similarity index 73%
rename from Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t26x-mc.yaml
rename to Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t26x-mc.yaml
index e236fec9..354f2291 100644
--- a/Documentation/devicetree/bindings/memory/tegra/private-soc/nvidia,tegra-t26x-mc.yaml
+++ b/Documentation/devicetree/bindings/memory/tegra/nvidia,tegra-t26x-mc.yaml
@@ -1,13 +1,5 @@
-# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 %YAML 1.2
 ---
@@ -21,7 +13,7 @@ maintainers:
 
 description: |
      the compatability = nvidia,tegra-t26x-mc is mentioned in the following drivers
-        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/private-soc/mc-t26x.c
+        - <TOP>/kernel/nvidia-oot/drivers/memory/tegra/mc-t26x.c
 
      The following nodes use this compatibility
         - /bus@0/mc_carveout@8108020000
diff --git a/drivers/devfreq/governor_pod_scaling.c b/drivers/devfreq/governor_pod_scaling.c
index 51ed9525..0b542e70 100644
--- a/drivers/devfreq/governor_pod_scaling.c
+++ b/drivers/devfreq/governor_pod_scaling.c
@@ -15,7 +15,7 @@
 #include <linux/types.h>
 #include <linux/version.h>
 
-#include <drivers-private/devfreq/governor.h>
+#include <devfreq/governor.h>
 
 
 #define DEFINE_ATTR_LOAD_STORE(name, limit)				\
diff --git a/drivers/devfreq/tegra_wmark.c b/drivers/devfreq/tegra_wmark.c
index 5a760f53..35c435f5 100644
--- a/drivers/devfreq/tegra_wmark.c
+++ b/drivers/devfreq/tegra_wmark.c
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/*
- * SPDX-FileCopyrightText: Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- */
+// SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 #include <nvidia/conftest.h>
 
@@ -15,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/version.h>
 
-#include <drivers-private/devfreq/governor.h>
+#include <devfreq/governor.h>
 
 /**
  * struct tegra_wmark_data - governor private data stored in struct devfreq
diff --git a/drivers/memory/tegra/Makefile b/drivers/memory/tegra/Makefile
index b11e5fd2..7d5a4a2e 100644
--- a/drivers/memory/tegra/Makefile
+++ b/drivers/memory/tegra/Makefile
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) 2023, NVIDIA CORPORATION.  All rights reserved.
+# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
-obj-m += private-soc/
+obj-m += mc-t26x.o
+obj-m += tegra264-mc-hwpm.o
+obj-m += smmu-hwpm.o
+obj-m += mem-qual.o
diff --git a/drivers/memory/tegra/private-soc/mc-t26x.c b/drivers/memory/tegra/mc-t26x.c
similarity index 100%
rename from drivers/memory/tegra/private-soc/mc-t26x.c
rename to drivers/memory/tegra/mc-t26x.c
diff --git a/drivers/memory/tegra/private-soc/mem-qual.c b/drivers/memory/tegra/mem-qual.c
similarity index 100%
rename from drivers/memory/tegra/private-soc/mem-qual.c
rename to drivers/memory/tegra/mem-qual.c
diff --git a/drivers/memory/tegra/private-soc/Makefile b/drivers/memory/tegra/private-soc/Makefile
deleted file mode 100644
index 401b7696..00000000
--- a/drivers/memory/tegra/private-soc/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-m += mc-t26x.o
-obj-m += tegra264-mc-hwpm.o
-obj-m += smmu-hwpm.o
-obj-m += mem-qual.o
diff --git a/drivers/memory/tegra/private-soc/smmu-hwpm.c b/drivers/memory/tegra/smmu-hwpm.c
similarity index 100%
rename from drivers/memory/tegra/private-soc/smmu-hwpm.c
rename to drivers/memory/tegra/smmu-hwpm.c
diff --git a/drivers/memory/tegra/private-soc/tegra264-mc-hwpm.c b/drivers/memory/tegra/tegra264-mc-hwpm.c
similarity index 100%
rename from drivers/memory/tegra/private-soc/tegra264-mc-hwpm.c
rename to drivers/memory/tegra/tegra264-mc-hwpm.c
diff --git a/include/drivers-private/devfreq/governor.h b/include/devfreq/governor.h
similarity index 100%
rename from include/drivers-private/devfreq/governor.h
rename to include/devfreq/governor.h
diff --git a/include/drivers-private/pinctrl/pinctrl-utils.h b/include/pinctrl/pinctrl-utils.h
similarity index 100%
rename from include/drivers-private/pinctrl/pinctrl-utils.h
rename to include/pinctrl/pinctrl-utils.h
diff --git a/include/drivers-private/sound/soc/tegra/tegra_cif.h b/include/sound/soc/tegra/tegra_cif.h
similarity index 100%
rename from include/drivers-private/sound/soc/tegra/tegra_cif.h
rename to include/sound/soc/tegra/tegra_cif.h
diff --git a/sound/soc/tegra/tegra186_arad.c b/sound/soc/tegra/tegra186_arad.c
index c5ecbe6c..ff9f1fa9 100644
--- a/sound/soc/tegra/tegra186_arad.c
+++ b/sound/soc/tegra/tegra186_arad.c
@@ -23,7 +23,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <drivers-private/sound/soc/tegra/tegra_cif.h>
+#include <sound/soc/tegra/tegra_cif.h>
 
 #include "tegra186_arad.h"
 
diff --git a/sound/soc/tegra/tegra210_afc.c b/sound/soc/tegra/tegra210_afc.c
index 70609ecf..055c5f5c 100644
--- a/sound/soc/tegra/tegra210_afc.c
+++ b/sound/soc/tegra/tegra210_afc.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2014-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // tegra210_afc.c - Tegra210 AFC driver
 
@@ -19,7 +19,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <drivers-private/sound/soc/tegra/tegra_cif.h>
+#include <sound/soc/tegra/tegra_cif.h>
 
 #include "tegra210_afc.h"
 
diff --git a/sound/soc/tegra/tegra210_iqc.c b/sound/soc/tegra/tegra210_iqc.c
index 93897252..79309328 100644
--- a/sound/soc/tegra/tegra210_iqc.c
+++ b/sound/soc/tegra/tegra210_iqc.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2014-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2014-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // tegra210_iqc.c - Tegra210 IQC driver
 
@@ -19,7 +19,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 
-#include <drivers-private/sound/soc/tegra/tegra_cif.h>
+#include <sound/soc/tegra/tegra_cif.h>
 
 #include "tegra210_iqc.h"