diff --git a/src/mainboard/google/zork/variants/morphius/overridetree.cb b/src/mainboard/google/zork/variants/morphius/overridetree.cb
index 48747c4dfa..60634308bb 100644
--- a/src/mainboard/google/zork/variants/morphius/overridetree.cb
+++ b/src/mainboard/google/zork/variants/morphius/overridetree.cb
@@ -30,7 +30,6 @@ chip soc/amd/picasso
 	register "telemetry_vddcr_soc_offset" = "0"
 
 	# Set STAPM confiuration for tablet mode
-	register "dptc_tablet_mode_enable" = "true"
 	register "slow_ppt_limit_tablet_mode_mW" = "20000"
 	register "fast_ppt_limit_tablet_mode_mW" = "24000"
 	register "sustained_power_limit_tablet_mode_mW" = "12000"
diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h
index 7ff36fcde2..3320350ee1 100644
--- a/src/soc/amd/picasso/chip.h
+++ b/src/soc/amd/picasso/chip.h
@@ -117,9 +117,6 @@ struct soc_amd_picasso_config {
 	uint32_t stapm_time_constant_s;
 	uint32_t sustained_power_limit_mW;
 
-	/* Enable dptc tablet mode */
-	bool dptc_tablet_mode_enable;
-
 	/* STAPM Configuration for tablet mode */
 	uint32_t fast_ppt_limit_tablet_mode_mW;
 	uint32_t slow_ppt_limit_tablet_mode_mW;
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index afa8565515..2fe8a217a6 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -184,10 +184,7 @@ static void acipgen_dptci(void)
 {
 	const struct soc_amd_picasso_config *config = config_of_soc();
 
-	if (!config->dptc_tablet_mode_enable)
-		return;
-
-	/* DPTC is enabled. Always fill out the default DPTC values. */
+	/* Normal mode DPTC values. */
 	struct dptc_input default_input = DPTC_INPUTS(config->thermctl_limit_degreeC,
 							config->sustained_power_limit_mW,
 							config->fast_ppt_limit_mW,
@@ -207,7 +204,8 @@ static void acipgen_dptci(void)
 static void root_complex_fill_ssdt(const struct device *device)
 {
 	acpi_fill_root_complex_tom(device);
-	acipgen_dptci();
+	if (CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC))
+		acipgen_dptci();
 }
 
 static const char *gnb_acpi_name(const struct device *dev)