diff --git a/src/soc/amd/mendocino/Kconfig b/src/soc/amd/mendocino/Kconfig
index 23c280fe76..528633391c 100644
--- a/src/soc/amd/mendocino/Kconfig
+++ b/src/soc/amd/mendocino/Kconfig
@@ -64,6 +64,7 @@ config SOC_AMD_REMBRANDT_BASE
 	select SOC_AMD_COMMON_BLOCK_SMI
 	select SOC_AMD_COMMON_BLOCK_SMM
 	select SOC_AMD_COMMON_BLOCK_SMU
+	select SOC_AMD_COMMON_BLOCK_SMU_SX_ENTRY
 	select SOC_AMD_COMMON_BLOCK_SPI
 	select SOC_AMD_COMMON_BLOCK_STB
 	select SOC_AMD_COMMON_BLOCK_TSC_FAM17H_19H
diff --git a/src/soc/amd/mendocino/Makefile.inc b/src/soc/amd/mendocino/Makefile.inc
index 70eb6bc2cb..7628deed03 100644
--- a/src/soc/amd/mendocino/Makefile.inc
+++ b/src/soc/amd/mendocino/Makefile.inc
@@ -46,7 +46,6 @@ ramstage-y	+= xhci.c
 
 smm-y		+= gpio.c
 smm-y		+= smihandler.c
-smm-y		+= smu.c
 smm-$(CONFIG_DEBUG_SMI) += uart.c
 
 CPPFLAGS_common += -I$(src)/soc/amd/mendocino/include
diff --git a/src/soc/amd/mendocino/smu.c b/src/soc/amd/mendocino/smu.c
deleted file mode 100644
index 1496957117..0000000000
--- a/src/soc/amd/mendocino/smu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <console/console.h>
-#include <amdblocks/smu.h>
-#include <soc/smu.h>
-
-/*
- * Request the SMU to put system into S3, S4, or S5. On entry, SlpTyp determines S-State and
- * SlpTypeEn gets set by the SMU. Function does not return if successful.
- */
-void smu_sx_entry(void)
-{
-	struct smu_payload msg = { 0 }; /* Unused for SMC_MSG_S3ENTRY */
-
-	printk(BIOS_DEBUG, "SMU: Put system into S3/S4/S5\n");
-	send_smu_message(SMC_MSG_S3ENTRY, &msg);
-}