diff --git a/src/soc/amd/picasso/acpi/aoac.asl b/src/soc/amd/common/acpi/aoac.asl
similarity index 100%
rename from src/soc/amd/picasso/acpi/aoac.asl
rename to src/soc/amd/common/acpi/aoac.asl
diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index 6c3c51dedf..926bf10c39 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <soc/amd/common/acpi/aoac.asl>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <amdblocks/acpimmio_map.h>
-#include <aoac.asl>
 
 Device (AAHB)
 {
diff --git a/src/soc/amd/picasso/acpi/soc.asl b/src/soc/amd/picasso/acpi/soc.asl
index b3b036ea7d..b411c20ba4 100644
--- a/src/soc/amd/picasso/acpi/soc.asl
+++ b/src/soc/amd/picasso/acpi/soc.asl
@@ -11,9 +11,6 @@ Device(PCI0) {
 /* Describe PCI INT[A-H] for the Southbridge */
 #include "pci_int.asl"
 
-/* Describe the AOAC devices */
-#include "aoac.asl"
-
 /* Describe the devices in the Southbridge */
 #include "sb_fch.asl"