summaryrefslogtreecommitdiff
path: root/src/soc/amd/picasso
diff options
context:
space:
mode:
authorFred Reitberger <reitbergerfred@gmail.com>2022-11-03 15:26:47 -0400
committerFred Reitberger <reitbergerfred@gmail.com>2022-11-04 20:39:32 +0000
commitaab7f0490419c50a1bcb58a0657a5a8224b21c6d (patch)
treea6a200bcf305a0d47919403d4b404b5f760fda54 /src/soc/amd/picasso
parent1a9ac347212f2fd0bbd80a3449ef486e3d643b64 (diff)
soc/amd/*/data_fabric: Use common device ops
Use the common device ops instead of an soc-specific device ops. TEST=builds for each soc Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com> Change-Id: I1804200c3c3f5ab492d237f4b03484c383862caf Reviewed-on: https://review.coreboot.org/c/coreboot/+/69174 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc/amd/picasso')
-rw-r--r--src/soc/amd/picasso/Makefile.inc1
-rw-r--r--src/soc/amd/picasso/chipset.cb16
-rw-r--r--src/soc/amd/picasso/data_fabric.c40
3 files changed, 8 insertions, 49 deletions
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 397c54d618..ab18e3bc1d 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -31,7 +31,6 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += agesa_acpi.c
ramstage-y += chip.c
ramstage-y += cpu.c
-ramstage-y += data_fabric.c
ramstage-y += fch.c
ramstage-y += fsp_s_params.c
ramstage-y += gpio.c
diff --git a/src/soc/amd/picasso/chipset.cb b/src/soc/amd/picasso/chipset.cb
index e44ca8d098..99b025e9c7 100644
--- a/src/soc/amd/picasso/chipset.cb
+++ b/src/soc/amd/picasso/chipset.cb
@@ -37,14 +37,14 @@ chip soc/amd/picasso
device pci 14.0 alias smbus on ops amd_smbus_ops end # primary FCH function
device pci 14.3 alias lpc_bridge on ops amd_lpc_ops end
device pci 14.6 alias sdhci off end
- device pci 18.0 alias data_fabric_0 on ops picasso_data_fabric_ops end
- device pci 18.1 alias data_fabric_1 on ops picasso_data_fabric_ops end
- device pci 18.2 alias data_fabric_2 on ops picasso_data_fabric_ops end
- device pci 18.3 alias data_fabric_3 on ops picasso_data_fabric_ops end
- device pci 18.4 alias data_fabric_4 on ops picasso_data_fabric_ops end
- device pci 18.5 alias data_fabric_5 on ops picasso_data_fabric_ops end
- device pci 18.6 alias data_fabric_6 on ops picasso_data_fabric_ops end
- device pci 18.7 alias data_fabric_7 on ops picasso_data_fabric_ops end
+ device pci 18.0 alias data_fabric_0 on ops amd_data_fabric_ops end
+ device pci 18.1 alias data_fabric_1 on ops amd_data_fabric_ops end
+ device pci 18.2 alias data_fabric_2 on ops amd_data_fabric_ops end
+ device pci 18.3 alias data_fabric_3 on ops amd_data_fabric_ops end
+ device pci 18.4 alias data_fabric_4 on ops amd_data_fabric_ops end
+ device pci 18.5 alias data_fabric_5 on ops amd_data_fabric_ops end
+ device pci 18.6 alias data_fabric_6 on ops amd_data_fabric_ops end
+ device pci 18.7 alias data_fabric_7 on ops amd_data_fabric_ops end
end
device mmio 0xfedc4000 alias i2c_2 off ops soc_amd_i2c_mmio_ops end
diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c
deleted file mode 100644
index a25115886e..0000000000
--- a/src/soc/amd/picasso/data_fabric.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <acpi/acpi_device.h>
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-
-static const char *data_fabric_acpi_name(const struct device *dev)
-{
- switch (dev->device) {
- case PCI_DID_AMD_FAM17H_MODEL18H_DF0:
- return "DFD0";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF1:
- return "DFD1";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF2:
- return "DFD2";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF3:
- return "DFD3";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF4:
- return "DFD4";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF5:
- return "DFD5";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF6:
- return "DFD6";
- case PCI_DID_AMD_FAM17H_MODEL18H_DF7:
- return "DFD7";
- default:
- printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device);
- }
-
- return NULL;
-}
-
-struct device_operations picasso_data_fabric_ops = {
- .read_resources = noop_read_resources,
- .set_resources = noop_set_resources,
- .acpi_name = data_fabric_acpi_name,
- .acpi_fill_ssdt = acpi_device_write_pci_dev,
-};