diff --git a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
index 28eb8a26deaa..0545a8cb0c47 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
@@ -10,33 +10,33 @@
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp00 {
+		opp@408000000 {
 			opp-hz = /bits/ 64 <408000000>;
 			opp-microvolt = <800000>;
 			clock-latency-ns = <40000>;
 		};
-		opp01 {
+		opp@600000000 {
 			opp-hz = /bits/ 64 <600000000>;
 			opp-microvolt = <800000>;
 			clock-latency-ns = <40000>;
 		};
-		opp02 {
+		opp@816000000 {
 			opp-hz = /bits/ 64 <816000000>;
 			opp-microvolt = <850000>;
 			clock-latency-ns = <40000>;
 			opp-suspend;
 		};
-		opp03 {
+		opp@1008000000 {
 			opp-hz = /bits/ 64 <1008000000>;
 			opp-microvolt = <925000>;
 			clock-latency-ns = <40000>;
 		};
-		opp04 {
+		opp@1200000000 {
 			opp-hz = /bits/ 64 <1200000000>;
 			opp-microvolt = <1000000>;
 			clock-latency-ns = <40000>;
 		};
-		opp05 {
+		opp@1416000000 {
 			opp-hz = /bits/ 64 <1416000000>;
 			opp-microvolt = <1125000>;
 			clock-latency-ns = <40000>;
@@ -47,43 +47,43 @@
 		compatible = "operating-points-v2";
 		opp-shared;
 
-		opp00 {
+		opp@408000000 {
 			opp-hz = /bits/ 64 <408000000>;
 			opp-microvolt = <800000>;
 			clock-latency-ns = <40000>;
 		};
-		opp01 {
+		opp@600000000 {
 			opp-hz = /bits/ 64 <600000000>;
 			opp-microvolt = <800000>;
 			clock-latency-ns = <40000>;
 		};
-		opp02 {
+		opp@816000000 {
 			opp-hz = /bits/ 64 <816000000>;
 			opp-microvolt = <825000>;
 			clock-latency-ns = <40000>;
 			opp-suspend;
 		};
-		opp03 {
+		opp@1008000000 {
 			opp-hz = /bits/ 64 <1008000000>;
 			opp-microvolt = <875000>;
 			clock-latency-ns = <40000>;
 		};
-		opp04 {
+		opp@1200000000 {
 			opp-hz = /bits/ 64 <1200000000>;
 			opp-microvolt = <950000>;
 			clock-latency-ns = <40000>;
 		};
-		opp05 {
+		opp@1416000000 {
 			opp-hz = /bits/ 64 <1416000000>;
 			opp-microvolt = <1025000>;
 			clock-latency-ns = <40000>;
 		};
-		opp06 {
+		opp@1608000000 {
 			opp-hz = /bits/ 64 <1608000000>;
 			opp-microvolt = <1100000>;
 			clock-latency-ns = <40000>;
 		};
-		opp07 {
+		opp@1800000000 {
 			opp-hz = /bits/ 64 <1800000000>;
 			opp-microvolt = <1200000>;
 			clock-latency-ns = <40000>;
@@ -93,27 +93,27 @@
 	gpu_opp_table: opp-table2 {
 		compatible = "operating-points-v2";
 
-		opp00 {
+		opp@200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 			opp-microvolt = <800000>;
 		};
-		opp01 {
+		opp@297000000 {
 			opp-hz = /bits/ 64 <297000000>;
 			opp-microvolt = <800000>;
 		};
-		opp02 {
+		opp@400000000 {
 			opp-hz = /bits/ 64 <400000000>;
 			opp-microvolt = <825000>;
 		};
-		opp03 {
+		opp@500000000 {
 			opp-hz = /bits/ 64 <500000000>;
 			opp-microvolt = <875000>;
 		};
-		opp04 {
+		opp@600000000 {
 			opp-hz = /bits/ 64 <600000000>;
 			opp-microvolt = <925000>;
 		};
-		opp05 {
+		opp@800000000 {
 			opp-hz = /bits/ 64 <800000000>;
 			opp-microvolt = <1100000>;
 		};
@@ -122,23 +122,23 @@
 	dmc_opp_table: opp-table3 {
 		compatible = "operating-points-v2";
 
-		opp00 {
+		opp@200000000 {
 			opp-hz = /bits/ 64 <200000000>;
 			opp-microvolt = <825000>;
 		};
-		opp01 {
+		opp@297000000 {
 			opp-hz = /bits/ 64 <297000000>;
 			opp-microvolt = <850000>;
 		};
-		opp02 {
+		opp@400000000 {
 			opp-hz = /bits/ 64 <400000000>;
 			opp-microvolt = <850000>;
 		};
-		opp03 {
+		opp@594000000 {
 			opp-hz = /bits/ 64 <594000000>;
 			opp-microvolt = <900000>;
 		};
-		opp04 {
+		opp@800000000 {
 			opp-hz = /bits/ 64 <800000000>;
 			opp-microvolt = <900000>;
 		};