PCI: tegra264: Remove private-soc directory

Move files from private-soc to parent controller directory.

Bug 5054840

Change-Id: I8ec5e5b34f2226bbbd051f4313033153a096e5c1
Signed-off-by: Prakhar Srivastava <prasrivastav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3312461
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
This commit is contained in:
Prakhar Srivastava
2025-03-03 06:48:28 +00:00
committed by Jon Hunter
parent f654e9aed9
commit 2e68d82f52
15 changed files with 29 additions and 20 deletions

View File

@@ -118,9 +118,9 @@ kernel_module(
"drivers/nvtzvault/nvtzvault.ko",
"drivers/nv-virtio/nv-virtio-console-poc.ko",
"drivers/pci/controller/pcie-tegra-vf.ko",
"drivers/pci/controller/private-soc/pcie-tegra264.ko",
"drivers/pci/controller/private-soc/pcie-tegra264-ep.ko",
"drivers/pci/controller/private-soc/tegra-pcie-dma-lib.ko",
"drivers/pci/controller/pcie-tegra264.ko",
"drivers/pci/controller/pcie-tegra264-ep.ko",
"drivers/pci/controller/tegra-pcie-dma-lib.ko",
"drivers/pci/controller/tegra-pcie-edma.ko",
"drivers/pci/endpoint/functions/pci-epf-dma-test.ko",
"drivers/pci/endpoint/functions/pci-epf-tegra-vnet.ko",

View File

@@ -1,4 +1,4 @@
# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright (c) 2024-2025, 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,
@@ -21,7 +21,7 @@ maintainers:
description: |
the compatability = nvidia,tegra264-pcie-ep is mentioned in the following drivers
- <TOP>/kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264-ep.c
- <TOP>/kernel/nvidia-oot/drivers/pci/controller/pcie-tegra264-ep.c
select:
properties:

View File

@@ -1,4 +1,4 @@
# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# Copyright (c) 2024-2025, 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,
@@ -21,8 +21,7 @@ maintainers:
description: |
the compatability = nvidia,tegra264-pcie is mentioned in the following drivers
- <TOP>/kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264-ep.c
- <TOP>/kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264.c
- <TOP>/kernel/nvidia-oot/drivers/pci/controller/pcie-tegra264.c
select:
properties:

View File

@@ -1,7 +1,27 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved.
# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved.
obj-m += tegra-pcie-edma.o
obj-m += pcie-tegra-vf.o
obj-m += private-soc/
# Set config when build as OOT module.
ifneq ($(NV_OOT_PCIE_T264_SOC_SKIP_BUILD),y)
ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
CONFIG_PCIE_TEGRA264 := m
CONFIG_PCIE_TEGRA264_EP := m
endif
obj-$(CONFIG_PCIE_TEGRA264) += pcie-tegra264.o
obj-$(CONFIG_PCIE_TEGRA264_EP) += pcie-tegra264-ep.o
ifeq ($(CONFIG_TEGRA_OOT_MODULE),m)
obj-m += tegra-pcie-dma-lib.o
tegra-pcie-dma-lib-objs:= tegra-pcie-dma.o \
tegra234-pcie-edma.o \
tegra264-pcie-xdma.o
endif
else
obj-m += pcie-tegra264.o
pcie-tegra264-objs := pcie-tegra-soc-dummy.o
endif

View File

@@ -1,10 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only
# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
obj-m += pcie-tegra264.o
obj-m += pcie-tegra264-ep.o
obj-m += tegra-pcie-dma-lib.o
tegra-pcie-dma-lib-objs:= tegra-pcie-dma.o \
tegra234-pcie-edma.o \
tegra264-pcie-xdma.o