From aab7f0490419c50a1bcb58a0657a5a8224b21c6d Mon Sep 17 00:00:00 2001 From: Fred Reitberger Date: Thu, 3 Nov 2022 15:26:47 -0400 Subject: 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 Change-Id: I1804200c3c3f5ab492d237f4b03484c383862caf Reviewed-on: https://review.coreboot.org/c/coreboot/+/69174 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/cezanne/Makefile.inc | 1 - src/soc/amd/cezanne/chipset.cb | 16 ++++++------- src/soc/amd/cezanne/data_fabric.c | 48 --------------------------------------- 3 files changed, 8 insertions(+), 57 deletions(-) delete mode 100644 src/soc/amd/cezanne/data_fabric.c (limited to 'src/soc/amd/cezanne') diff --git a/src/soc/amd/cezanne/Makefile.inc b/src/soc/amd/cezanne/Makefile.inc index cdbbcfefd4..1f2bb6d6e8 100644 --- a/src/soc/amd/cezanne/Makefile.inc +++ b/src/soc/amd/cezanne/Makefile.inc @@ -31,7 +31,6 @@ ramstage-y += acpi.c ramstage-y += 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/cezanne/chipset.cb b/src/soc/amd/cezanne/chipset.cb index 3b6e0d8349..f0a3d861d0 100644 --- a/src/soc/amd/cezanne/chipset.cb +++ b/src/soc/amd/cezanne/chipset.cb @@ -97,14 +97,14 @@ chip soc/amd/cezanne 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 18.0 alias data_fabric_0 on ops cezanne_data_fabric_ops end - device pci 18.1 alias data_fabric_1 on ops cezanne_data_fabric_ops end - device pci 18.2 alias data_fabric_2 on ops cezanne_data_fabric_ops end - device pci 18.3 alias data_fabric_3 on ops cezanne_data_fabric_ops end - device pci 18.4 alias data_fabric_4 on ops cezanne_data_fabric_ops end - device pci 18.5 alias data_fabric_5 on ops cezanne_data_fabric_ops end - device pci 18.6 alias data_fabric_6 on ops cezanne_data_fabric_ops end - device pci 18.7 alias data_fabric_7 on ops cezanne_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 0xfedc2000 alias i2c_0 off ops soc_amd_i2c_mmio_ops end diff --git a/src/soc/amd/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c deleted file mode 100644 index 6a34a07d15..0000000000 --- a/src/soc/amd/cezanne/data_fabric.c +++ /dev/null @@ -1,48 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include - -static const char *data_fabric_acpi_name(const struct device *dev) -{ - switch (dev->device) { - case PCI_DID_AMD_FAM17H_MODEL60H_DF0: - case PCI_DID_AMD_FAM19H_MODEL51H_DF0: - return "DFD0"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF1: - case PCI_DID_AMD_FAM19H_MODEL51H_DF1: - return "DFD1"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF2: - case PCI_DID_AMD_FAM19H_MODEL51H_DF2: - return "DFD2"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF3: - case PCI_DID_AMD_FAM19H_MODEL51H_DF3: - return "DFD3"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF4: - case PCI_DID_AMD_FAM19H_MODEL51H_DF4: - return "DFD4"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF5: - case PCI_DID_AMD_FAM19H_MODEL51H_DF5: - return "DFD5"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF6: - case PCI_DID_AMD_FAM19H_MODEL51H_DF6: - return "DFD6"; - case PCI_DID_AMD_FAM17H_MODEL60H_DF7: - case PCI_DID_AMD_FAM19H_MODEL51H_DF7: - return "DFD7"; - default: - printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); - } - - return NULL; -} - -struct device_operations cezanne_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, -}; -- cgit v1.2.3