diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig
index cc2fd9fc2b..ddc08b984d 100644
--- a/src/soc/amd/cezanne/Kconfig
+++ b/src/soc/amd/cezanne/Kconfig
@@ -13,7 +13,6 @@ config SOC_SPECIFIC_OPTIONS
 	select ARCH_VERSTAGE_X86_32
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
-	select ACPI_AMD_HARDWARE_SLEEP_VALUES
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH
 	select FSP_COMPRESS_FSP_M_LZMA
 	select FSP_COMPRESS_FSP_S_LZMA
diff --git a/src/soc/amd/common/block/acpi/Kconfig b/src/soc/amd/common/block/acpi/Kconfig
index 2b87f186fb..21961f792d 100644
--- a/src/soc/amd/common/block/acpi/Kconfig
+++ b/src/soc/amd/common/block/acpi/Kconfig
@@ -1,6 +1,7 @@
 config SOC_AMD_COMMON_BLOCK_ACPI
 	bool
 	depends on SOC_AMD_COMMON_BLOCK_ACPIMMIO
+	select ACPI_AMD_HARDWARE_SLEEP_VALUES
 	default n
 	help
 	  Select this option to use the AcpiMmio ACPI registers.
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 2a716810fb..410048fdd4 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -16,7 +16,6 @@ config CPU_SPECIFIC_OPTIONS
 	select RESET_VECTOR_IN_RAM
 	select X86_AMD_FIXED_MTRRS
 	select X86_AMD_INIT_SIPI
-	select ACPI_AMD_HARDWARE_SLEEP_VALUES
 	select ACPI_SOC_NVS
 	select DRIVERS_I2C_DESIGNWARE
 	select DRIVERS_USB_PCI_XHCI
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index a1b109e839..dcd6b8f146 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -9,7 +9,6 @@ if SOC_AMD_STONEYRIDGE
 
 config CPU_SPECIFIC_OPTIONS
 	def_bool y
-	select ACPI_AMD_HARDWARE_SLEEP_VALUES
 	select ACPI_SOC_NVS
 	select ARCH_ALL_STAGES_X86_32
 	select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH