diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi
index 1498ead15044..0e2edddf2a97 100644
--- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi
@@ -79,6 +79,7 @@
 	};
 
 	vcc3v3_lcd_n: vcc3v3-lcd0-n {
+		status = "disabled";
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3_lcd0_n";
 		regulator-boot-on;
@@ -401,14 +402,13 @@
 	status = "okay";
 };
 
-&spi1 {
+&spi0 {
 	status = "okay";
-	max-freq = <50000000>; /* spi internal clk, don't modify */
-	pinctrl-names = "default", "high_speed";
-	pinctrl-0 = <&spi1m1_csn0 &spi1m1_pins>;
-	spi_dev@0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi0m0_csn0 &spi0m0_pins>;
+	spi-dev@0 {
 		compatible = "rockchip,spidev";
-		reg = <0>;
+		reg = <0x0>;
 		spi-max-frequency = <50000000>;
 		spi-lsb-first;
 	};
diff --git a/drivers/soc/rockchip/sdmmc_vendor_storage.c b/drivers/soc/rockchip/sdmmc_vendor_storage.c
index ea1d9410b8eb..5c14c484cd6a 100644
--- a/drivers/soc/rockchip/sdmmc_vendor_storage.c
+++ b/drivers/soc/rockchip/sdmmc_vendor_storage.c
@@ -85,6 +85,7 @@ static int emmc_vendor_storage_init(void)
 				EMMC_VENDOR_PART_SIZE * max_index,
 				EMMC_VENDOR_PART_SIZE, 0))
 			goto error_exit;
+		g_vendor->free_size = sizeof(g_vendor->data) - g_vendor->free_offset;
 	} else {
 		memset((void *)g_vendor, 0, sizeof(*g_vendor));
 		g_vendor->version = 1;
@@ -160,8 +161,7 @@ static int emmc_vendor_write(u32 id, void *pbuf, u32 size)
 				item->size = size;
 				memcpy(&p_data[item->offset], pbuf, size);
 				g_vendor->free_offset = offset + align_size;
-				g_vendor->free_size -= (align_size -
-							alloc_size);
+				g_vendor->free_size = sizeof(g_vendor->data) - g_vendor->free_offset;
 			} else {
 				memcpy(&p_data[item->offset],
 				       pbuf,
diff --git a/drivers/usb/typec/tcpm/tcpci_husb311.c b/drivers/usb/typec/tcpm/tcpci_husb311.c
index 175d5f3e2a1d..6eaba84a5b69 100644
--- a/drivers/usb/typec/tcpm/tcpci_husb311.c
+++ b/drivers/usb/typec/tcpm/tcpci_husb311.c
@@ -207,6 +207,10 @@ static irqreturn_t husb311_irq(int irq, void *dev_id)
 		}
 	}
 
+	/* TCPCI Spec. Table 4-27 ResetTransmitBuffer */
+	if (status & (TCPC_ALERT_TX_SUCCESS | TCPC_ALERT_TX_DISCARDED | TCPC_ALERT_TX_FAILED))
+		husb311_write8(chip, TCPC_COMMAND, 0xdd);
+
 	return tcpci_irq(chip->tcpci);
 }