diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index b18868dcec..a0254e98d3 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -55,6 +55,7 @@ config SOC_AMD_PICASSO
 	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_TSC_FAM17H_19H
 	select SOC_AMD_COMMON_BLOCK_UART
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 504a40ef85..cc073a7cfe 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -50,7 +50,6 @@ ifeq ($(CONFIG_DEBUG_SMI),y)
 smm-y += uart.c
 endif
 smm-y += gpio.c
-smm-y += smu.c
 
 CPPFLAGS_common += -I$(src)/soc/amd/picasso/include
 CPPFLAGS_common += -I$(src)/soc/amd/picasso/acpi
diff --git a/src/soc/amd/picasso/smu.c b/src/soc/amd/picasso/smu.c
deleted file mode 100644
index 076baaaded..0000000000
--- a/src/soc/amd/picasso/smu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <amdblocks/smu.h>
-#include <console/console.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);
-}