diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c
index 2dd0d425a1..4db00b1d6e 100644
--- a/src/soc/amd/common/block/sata/sata.c
+++ b/src/soc/amd/common/block/sata/sata.c
@@ -26,6 +26,10 @@ static struct device_operations sata_ops = {
 static const unsigned short pci_device_ids[] = {
 	PCI_DEVICE_ID_AMD_CZ_SATA,
 	PCI_DEVICE_ID_AMD_CZ_SATA_AHCI,
+	PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0,
+	PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1,
+	PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0,
+	PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1,
 	0
 };
 
diff --git a/src/soc/amd/picasso/acpi/sb_pci0_fch.asl b/src/soc/amd/picasso/acpi/sb_pci0_fch.asl
index 3e6029e0e0..04e72c0a45 100644
--- a/src/soc/amd/picasso/acpi/sb_pci0_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_pci0_fch.asl
@@ -23,11 +23,6 @@ Method(_OSC,4)
 
 /* Describe the Southbridge devices */
 
-/* 0:11.0 - SATA */
-Device(STCR) {
-	Name(_ADR, 0x00110000)
-} /* end STCR */
-
 /* 0:14.0 - SMBUS */
 Device(SBUS) {
 	Name(_ADR, 0x00140000)
diff --git a/src/soc/amd/picasso/chip.c b/src/soc/amd/picasso/chip.c
index 4b25b888d6..201afb40dd 100644
--- a/src/soc/amd/picasso/chip.c
+++ b/src/soc/amd/picasso/chip.c
@@ -65,8 +65,6 @@ const char *soc_acpi_name(const struct device *dev)
 		return "AZHD";
 	case LPC_DEVFN:
 		return "LPCB";
-	case SATA_DEVFN:
-		return "STCR";
 	case SMBUS_DEVFN:
 		return "SBUS";
 	case XHCI0_DEVFN: