From 7f7b01d46747e0147cac4427a2667dd6bf213a91 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 5 Oct 2022 14:47:00 +0200 Subject: soc/amd/sata.c: Hook up directly in devicetree Cezanne has two SATA controllers, but doesn't select SOC_AMD_COMMON_BLOCK_SATA, so it's not added to the SATA devices in the Cezanne chipset devicetree. Change-Id: If7f0a9638151cf981d891464a2c3a0ec5fc9c780 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/68142 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Fred Reitberger --- src/soc/amd/common/block/sata/sata.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/soc/amd/common/block') diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index 19a7d3edd5..6a271682c2 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -3,7 +3,6 @@ #include #include #include -#include #include static const char *sata_acpi_name(const struct device *dev) @@ -11,7 +10,7 @@ static const char *sata_acpi_name(const struct device *dev) return "STCR"; } -static struct device_operations sata_ops = { +struct device_operations amd_sata_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, @@ -20,19 +19,3 @@ static struct device_operations sata_ops = { .acpi_name = sata_acpi_name, .acpi_fill_ssdt = acpi_device_write_pci_dev, }; - -static const unsigned short pci_device_ids[] = { - PCI_DID_AMD_CZ_SATA, - PCI_DID_AMD_CZ_SATA_AHCI, - PCI_DID_AMD_FAM17H_SATA_AHCI_VER0, - PCI_DID_AMD_FAM17H_SATA_AHCI_VER1, - PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER0, - PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER1, - 0 -}; - -static const struct pci_driver sata0_driver __pci_driver = { - .ops = &sata_ops, - .vendor = PCI_VID_AMD, - .devices = pci_device_ids, -}; -- cgit v1.2.3