diff --git a/arch/arm64/configs/phytium_defconfig b/arch/arm64/configs/phytium_defconfig
index dc91caca96718147bf9f7fccb1edc66070aa3eac..21c153d16238d58ba9371fa31f66d9c9020d0b5b 100644
--- a/arch/arm64/configs/phytium_defconfig
+++ b/arch/arm64/configs/phytium_defconfig
@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="-phytium-embedded-v3.1"
+CONFIG_LOCALVERSION="-phytium-embedded-v3.2"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -699,8 +699,8 @@ CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_ISP1760=y
 CONFIG_USB_PHYTIUM=m
-CONFIG_USB_PHYTIUM_PCI_V2=m
-CONFIG_USB_PHYTIUM_V2=m
+CONFIG_USB_PHYTIUM_PCI_V2=y
+CONFIG_USB_PHYTIUM_V2=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
@@ -712,7 +712,7 @@ CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_SNP_UDC_PLAT=y
 CONFIG_USB_BDC_UDC=y
-CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_OBEX=y
@@ -723,15 +723,16 @@ CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_TYPEC=m
+CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_FUSB302=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
 CONFIG_UCSI_PMIC_GLINK=m
 CONFIG_TYPEC_TPS6598X=m
-CONFIG_TYPEC_PHYTIUM_RS=m
+CONFIG_TYPEC_PHYTIUM_RS=y
 CONFIG_TYPEC_HD3SS3220=m
 CONFIG_TYPEC_MUX_FSA4480=m
 CONFIG_TYPEC_MUX_GPIO_SBU=m
@@ -826,6 +827,8 @@ CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_TYPEC=m
+CONFIG_CROS_TYPEC_SWITCH=m
 CONFIG_CLK_VEXPRESS_OSC=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=y
@@ -879,6 +882,7 @@ CONFIG_IIO_CROS_EC_SENSORS=m
 CONFIG_IIO_ST_LSM6DSX=m
 CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 CONFIG_SENSORS_ISL29018=m
+CONFIG_STK3310=y
 CONFIG_VCNL4000=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
 CONFIG_IIO_CROS_EC_BARO=m
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 97777613f307a7afaff1bebe45f27c251bfb2ce7..0391a41ea5a1e79e77b3816080818eef6484f91d 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -1080,24 +1080,17 @@ static const struct phylink_mac_ops macb_phylink_ops = {
 	.mac_link_up = macb_mac_link_up,
 };
 
-static bool macb_phy_handle_exists(struct device_node *dn)
-{
-	dn = of_parse_phandle(dn, "phy-handle", 0);
-	of_node_put(dn);
-	return dn != NULL;
-}
-
 static int macb_phylink_connect(struct macb *bp)
 {
-	struct device_node *dn = bp->pdev->dev.of_node;
+	struct fwnode_handle *fwnode = dev_fwnode(&bp->pdev->dev);
 	struct net_device *dev = bp->dev;
 	struct phy_device *phydev;
 	int ret = 0;
 
-	if (dn)
-		ret = phylink_of_phy_connect(bp->phylink, dn, 0);
+	if (fwnode)
+		ret = phylink_fwnode_phy_connect(bp->phylink, fwnode, 0);
 
-	if (!dn || (ret && !macb_phy_handle_exists(dn))) {
+	if (!fwnode || ret) {
 		phydev = phy_find_first(bp->mii_bus);
 		if (!phydev) {
 			netdev_err(dev, "no PHY found\n");
@@ -1106,8 +1099,7 @@ static int macb_phylink_connect(struct macb *bp)
 		phydev->force_mode = bp->force_phy_mode;
 
 		/* attach the mac to the phy */
-		if (phylink_expects_phy(bp->phylink))
-			ret = phylink_connect_phy(bp->phylink, phydev);
+		ret = phylink_connect_phy(bp->phylink, phydev);
 	}
 
 	if (ret) {
diff --git a/sound/soc/phytium/phytium-i2s-v2.c b/sound/soc/phytium/phytium-i2s-v2.c
index 5659c4f729faebacb1106633b121d3a115a4904d..1817bf3ce2970e88db8d07292d4f382cb5f15ece 100644
--- a/sound/soc/phytium/phytium-i2s-v2.c
+++ b/sound/soc/phytium/phytium-i2s-v2.c
@@ -1055,7 +1055,11 @@ static int phyt_i2s_probe(struct platform_device *pdev)
 	}
 
 	if (pdev->dev.of_node) {
-		device_property_read_string(&pdev->dev, "dai-name", &dai_driver->name);
+		ret = device_property_read_string(&pdev->dev, "dai-name", &dai_driver->name);
+		if (ret < 0) {
+			dev_err(&pdev->dev, "missing dai-name property %d\n", ret);
+			goto failed_get_dai_name;
+		}
 		clk = devm_clk_get(&pdev->dev, NULL);
 		priv->clk_base = clk_get_rate(clk);
 	} else if (has_acpi_companion(&pdev->dev)) {