* because they can not be enabled simultaneously on a
         * single SoC.
         */
-       opp50@300000000 {
+       opp50-300000000 {
                opp-hz = /bits/ 64 <300000000>;
                opp-microvolt = <950000 931000 969000>;
                opp-supported-hw = <0x06 0x0010>;
                opp-suspend;
        };
 
-       opp100@275000000 {
+       opp100-275000000 {
                opp-hz = /bits/ 64 <275000000>;
                opp-microvolt = <1100000 1078000 1122000>;
                opp-supported-hw = <0x01 0x00FF>;
                opp-suspend;
        };
 
-       opp100@300000000 {
+       opp100-300000000 {
                opp-hz = /bits/ 64 <300000000>;
                opp-microvolt = <1100000 1078000 1122000>;
                opp-supported-hw = <0x06 0x0020>;
                opp-suspend;
        };
 
-       opp100@500000000 {
+       opp100-500000000 {
                opp-hz = /bits/ 64 <500000000>;
                opp-microvolt = <1100000 1078000 1122000>;
                opp-supported-hw = <0x01 0xFFFF>;
        };
 
-       opp100@600000000 {
+       opp100-600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <1100000 1078000 1122000>;
                opp-supported-hw = <0x06 0x0040>;
        };
 
-       opp120@600000000 {
+       opp120-600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <1200000 1176000 1224000>;
                opp-supported-hw = <0x01 0xFFFF>;
        };
 
-       opp120@720000000 {
+       opp120-720000000 {
                opp-hz = /bits/ 64 <720000000>;
                opp-microvolt = <1200000 1176000 1224000>;
                opp-supported-hw = <0x06 0x0080>;
        };
 
-       oppturbo@720000000 {
+       oppturbo-720000000 {
                opp-hz = /bits/ 64 <720000000>;
                opp-microvolt = <1260000 1234800 1285200>;
                opp-supported-hw = <0x01 0xFFFF>;
        };
 
-       oppturbo@800000000 {
+       oppturbo-800000000 {
                opp-hz = /bits/ 64 <800000000>;
                opp-microvolt = <1260000 1234800 1285200>;
                opp-supported-hw = <0x06 0x0100>;
        };
 
-       oppnitro@1000000000 {
+       oppnitro-1000000000 {
                opp-hz = /bits/ 64 <1000000000>;
                opp-microvolt = <1325000 1298500 1351500>;
                opp-supported-hw = <0x04 0x0200>;
 
         * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
         * to support 1GHz OPP so enable it for PG 2.0 on this board.
         */
-       oppnitro@1000000000 {
+       oppnitro-1000000000 {
                opp-supported-hw = <0x06 0x0100>;
        };
 };
 
                 * because the can not be enabled simultaneously on a
                 * single SoC.
                 */
-               opp50@300000000 {
+               opp50-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <950000 931000 969000>;
                        opp-supported-hw = <0x06 0x0010>;
                        opp-suspend;
                };
 
-               opp100@275000000 {
+               opp100-275000000 {
                        opp-hz = /bits/ 64 <275000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x01 0x00FF>;
                        opp-suspend;
                };
 
-               opp100@300000000 {
+               opp100-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x06 0x0020>;
                        opp-suspend;
                };
 
-               opp100@500000000 {
+               opp100-500000000 {
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               opp100@600000000 {
+               opp100-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x06 0x0040>;
                };
 
-               opp120@600000000 {
+               opp120-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               opp120@720000000 {
+               opp120-720000000 {
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0x06 0x0080>;
                };
 
-               oppturbo@720000000 {
+               oppturbo-720000000 {
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               oppturbo@800000000 {
+               oppturbo-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0x06 0x0100>;
                };
 
-               oppnitro@1000000000 {
+               oppnitro-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1325000 1298500 1351500>;
                        opp-supported-hw = <0x04 0x0200>;
 
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_conf>;
 
-               opp50@300000000 {
+               opp50-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <950000 931000 969000>;
                        opp-supported-hw = <0xFF 0x01>;
                        opp-suspend;
                };
 
-               opp100@600000000 {
+               opp100-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0xFF 0x04>;
                };
 
-               opp120@720000000 {
+               opp120-720000000 {
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0xFF 0x08>;
                };
 
-               oppturbo@800000000 {
+               oppturbo-800000000 {
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0xFF 0x10>;
                };
 
-               oppnitro@1000000000 {
+               oppnitro-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1325000 1298500 1351500>;
                        opp-supported-hw = <0xFF 0x20>;
 
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_wkup>;
 
-               opp_nom@1000000000 {
+               opp_nom-1000000000 {
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1060000 850000 1150000>;
                        opp-supported-hw = <0xFF 0x01>;
                        opp-suspend;
                };
 
-               opp_od@1176000000 {
+               opp_od-1176000000 {
                        opp-hz = /bits/ 64 <1176000000>;
                        opp-microvolt = <1160000 885000 1160000>;
                        opp-supported-hw = <0xFF 0x02>;