thermal-sensors = <&tsens0 1>;
 
                        trips {
-                               cpu0_alert0: trip-point@0 {
+                               cpu0_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu0_alert1: trip-point@1 {
+                               cpu0_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 2>;
 
                        trips {
-                               cpu1_alert0: trip-point@0 {
+                               cpu1_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu1_alert1: trip-point@1 {
+                               cpu1_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 3>;
 
                        trips {
-                               cpu2_alert0: trip-point@0 {
+                               cpu2_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu2_alert1: trip-point@1 {
+                               cpu2_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 4>;
 
                        trips {
-                               cpu3_alert0: trip-point@0 {
+                               cpu3_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu3_alert1: trip-point@1 {
+                               cpu3_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 7>;
 
                        trips {
-                               cpu4_alert0: trip-point@0 {
+                               cpu4_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu4_alert1: trip-point@1 {
+                               cpu4_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 8>;
 
                        trips {
-                               cpu5_alert0: trip-point@0 {
+                               cpu5_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu5_alert1: trip-point@1 {
+                               cpu5_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 9>;
 
                        trips {
-                               cpu6_alert0: trip-point@0 {
+                               cpu6_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu6_alert1: trip-point@1 {
+                               cpu6_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 10>;
 
                        trips {
-                               cpu7_alert0: trip-point@0 {
+                               cpu7_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                                };
 
-                               cpu7_alert1: trip-point@1 {
+                               cpu7_alert1: trip-point1 {
                                        temperature = <95000>;
                                        hysteresis = <2000>;
                                        type = "passive";
                        thermal-sensors = <&tsens0 0>;
 
                        trips {
-                               aoss0_alert0: trip-point@0 {
+                               aoss0_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens0 5>;
 
                        trips {
-                               cluster0_alert0: trip-point@0 {
+                               cluster0_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens0 6>;
 
                        trips {
-                               cluster1_alert0: trip-point@0 {
+                               cluster1_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens0 11>;
 
                        trips {
-                               gpu1_alert0: trip-point@0 {
+                               gpu1_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens0 12>;
 
                        trips {
-                               gpu2_alert0: trip-point@0 {
+                               gpu2_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 0>;
 
                        trips {
-                               aoss1_alert0: trip-point@0 {
+                               aoss1_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 1>;
 
                        trips {
-                               q6_modem_alert0: trip-point@0 {
+                               q6_modem_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 2>;
 
                        trips {
-                               mem_alert0: trip-point@0 {
+                               mem_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 3>;
 
                        trips {
-                               wlan_alert0: trip-point@0 {
+                               wlan_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 4>;
 
                        trips {
-                               q6_hvx_alert0: trip-point@0 {
+                               q6_hvx_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 5>;
 
                        trips {
-                               camera_alert0: trip-point@0 {
+                               camera_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 6>;
 
                        trips {
-                               video_alert0: trip-point@0 {
+                               video_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";
                        thermal-sensors = <&tsens1 7>;
 
                        trips {
-                               modem_alert0: trip-point@0 {
+                               modem_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
                                        type = "hot";