diff --git a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
index be7b5aea15..8629a64036 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/guybrush/variants/baseboard/devicetree.cb
@@ -206,12 +206,8 @@ chip soc/amd/cezanne
 			.tx_vboost_lvl_en=1,
 			.tx_vboost_lvl=5,
 		},
-
 		.ComboPhyStaticConfig[0] = 0,
 		.ComboPhyStaticConfig[1] = 0,
-		.Version_Major = 0xd,
-		.Version_Minor = 0x6,
-		.TableLength = 100,
 		.BatteryChargerEnable = 0,
 		.PhyP3CpmP4Support = 0,
 	}"
diff --git a/src/soc/amd/cezanne/fsp_m_params.c b/src/soc/amd/cezanne/fsp_m_params.c
index c641030088..c9853a7d40 100644
--- a/src/soc/amd/cezanne/fsp_m_params.c
+++ b/src/soc/amd/cezanne/fsp_m_params.c
@@ -229,8 +229,12 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
 	mcfg->hda_enable = devtree_hda_dev_enabled();
 	mcfg->sata_enable = devtree_sata_dev_enabled();
 
-	if (config->usb_phy_custom)
+	if (config->usb_phy_custom) {
 		mcfg->usb_phy = (struct usb_phy_config *)&config->usb_phy;
+		mcfg->usb_phy->Version_Major = 0xd;
+		mcfg->usb_phy->Version_Minor = 0x6;
+		mcfg->usb_phy->TableLength = 100;
+	}
 	else
 		mcfg->usb_phy = NULL;