From 69c0469bb94662f0fff523fe6eeb84911b397a47 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 27 Apr 2020 15:34:47 -0700 Subject: soc/amd/sata: Add .acpi_name() callback to SATA driver This change adds .acpi_name() callback to SATA driver that returns "STCR" as the ACPI device name for SATA. Since this is now done by the common SATA driver, this change also removes the SATA device name returned by stoneyridge in chip.c. BUG=b:153858769 Change-Id: I5e0998be3016febbb3b0e91940750a38edb6a9e7 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/40768 Reviewed-by: Aaron Durbin Reviewed-by: Angel Pons Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/soc/amd/common/block/sata/sata.c | 6 ++++++ src/soc/amd/stoneyridge/chip.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index e95587eafc..f9b6549494 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -8,11 +8,17 @@ void __weak soc_enable_sata_features(struct device *dev) { } +static const char *sata_acpi_name(const struct device *dev) +{ + return "STCR"; +} + static struct device_operations sata_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .init = soc_enable_sata_features, + .acpi_name = sata_acpi_name, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c index 189f48e8e9..b063c7287f 100644 --- a/src/soc/amd/stoneyridge/chip.c +++ b/src/soc/amd/stoneyridge/chip.c @@ -87,8 +87,6 @@ const char *soc_acpi_name(const struct device *dev) return "EHC0"; case LPC_DEVFN: return "LPCB"; - case SATA_DEVFN: - return "STCR"; case SD_DEVFN: return "SDCN"; case SMBUS_DEVFN: -- cgit v1.2.3