soc/amd/common/block/smbus: move ACPI name to common code
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I47415be02571240d3cecfdb91cb9f8097c5b7fde
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50819
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index ebd3f25..ce66cbb 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -58,6 +58,7 @@
device = dev->path.i2c.device;
return do_smbus_write_byte(get_sm_mmio(dev), device, address, val);
}
+
static struct smbus_bus_operations lops_smbus_bus = {
.recv_byte = lsmbus_recv_byte,
.send_byte = lsmbus_send_byte,
@@ -65,15 +66,26 @@
.write_byte = lsmbus_write_byte,
};
+#if CONFIG(HAVE_ACPI_TABLES)
+static const char *smbus_acpi_name(const struct device *dev)
+{
+ return "SBUS";
+}
+#endif
+
static struct device_operations smbus_ops = {
- .read_resources = noop_read_resources,
- .set_resources = noop_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .init = sm_init,
- .scan_bus = scan_smbus,
- .ops_pci = &pci_dev_ops_pci,
- .ops_smbus_bus = &lops_smbus_bus,
+ .read_resources = noop_read_resources,
+ .set_resources = noop_set_resources,
+ .enable_resources = pci_dev_enable_resources,
+ .init = sm_init,
+ .scan_bus = scan_smbus,
+ .ops_pci = &pci_dev_ops_pci,
+ .ops_smbus_bus = &lops_smbus_bus,
+#if CONFIG(HAVE_ACPI_TABLES)
+ .acpi_name = smbus_acpi_name,
+#endif
};
+
static const struct pci_driver smbus_driver __pci_driver = {
.ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_AMD,
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 65f815c..5bf347b 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -39,8 +39,6 @@
return "GNB";
case IOMMU_DEVFN:
return "IOMM";
- case SMBUS_DEVFN:
- return "SBUS";
default:
printk(BIOS_WARNING, "Unknown root PCI device: dev: %d, fn: %d\n",
PCI_SLOT(dev->path.pci.devfn), PCI_FUNC(dev->path.pci.devfn));
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 644ef66..8082165 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -83,8 +83,6 @@
return "EHC0";
case SD_DEVFN:
return "SDCN";
- case SMBUS_DEVFN:
- return "SBUS";
case XHCI_DEVFN:
return "XHC0";
default: