diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 1dbefbd60..48f249e4e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -2366,7 +2366,7 @@
 		};
 	};
 
-	gpu: gpu@fb000000 {
+	gpu_mali: gpu-mali@fb000000 {
 		compatible = "arm,mali-bifrost";
 		reg = <0x0 0xfb000000 0x0 0x200000>;
 		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,
@@ -2391,7 +2391,7 @@
 		status = "disabled";
 	};
 
-	gpu_panthor: gpu-panthor@fb000000 {
+	gpu: gpu@fb000000 {
 		compatible = "rockchip,rk3588-mali", "arm,mali-valhall-csf";
 		reg = <0x0 0xfb000000 0x0 0x200000>;
 		#cooling-cells = <2>;
@@ -5519,10 +5519,6 @@
 		compatible = "rockchip,rk3588-dfi";
 		reg = <0x00 0xfe060000 0x00 0x10000>;
 		rockchip,pmu_grf = <&pmu1_grf>;
-		clocks = <&cru PCLK_DDR_MON_CH0>, <&cru PCLK_DDR_MON_CH1>,
-			 <&cru PCLK_DDR_MON_CH2>, <&cru PCLK_DDR_MON_CH3>;
-		clock-names = "pclk_ddr_mon_ch0", "pclk_ddr_mon_ch1",
-			      "pclk_ddr_mon_ch2", "pclk_ddr_mon_ch3";
 		status = "disabled";
 	};
 
@@ -6673,8 +6669,8 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		clocks = <&cru CLK_OTPC_NS>, <&cru PCLK_OTPC_NS>,
-			 <&cru CLK_OTP_PHY_G>;
-		clock-names = "otpc", "apb", "phy";
+			 <&cru CLK_OTPC_ARB>, <&cru CLK_OTP_PHY_G>;
+		clock-names = "otpc", "apb", "arb", "phy";
 		resets = <&cru SRST_OTPC_NS>, <&cru SRST_P_OTPC_NS>,
 			 <&cru SRST_OTPC_ARB>;
 		reset-names = "otpc", "apb", "arb";