diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-16 23:53:43 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-18 01:15:04 +0000 |
| commit | 66b4f0181c6a4b2a27bb439a06d97683a8d7a179 (patch) | |
| tree | c76371ffaaf4488ad9b91e7e60bb0d730d2d9ea3 /src/soc/amd | |
| parent | 3e29ca93fc98a3481a313c24d7b1c50b52c0ab4e (diff) | |
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>
Diffstat (limited to 'src/soc/amd')
| -rw-r--r-- | src/soc/amd/common/block/smbus/sm.c | 26 | ||||
| -rw-r--r-- | src/soc/amd/picasso/chip.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/chip.c | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c index ebd3f258a9..ce66cbbb7a 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -58,6 +58,7 @@ static int lsmbus_write_byte(struct device *dev, u8 address, u8 val) 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 @@ static struct smbus_bus_operations lops_smbus_bus = { .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 65f815c0f9..5bf347b45c 100644 --- a/src/soc/amd/picasso/chip.c +++ b/src/soc/amd/picasso/chip.c @@ -39,8 +39,6 @@ static const char *soc_acpi_name(const struct device *dev) 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 644ef668bb..8082165328 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -83,8 +83,6 @@ const char *soc_acpi_name(const struct device *dev) return "EHC0"; case SD_DEVFN: return "SDCN"; - case SMBUS_DEVFN: - return "SBUS"; case XHCI_DEVFN: return "XHC0"; default: |