arm: dts: ti: omap: Fix OPP table node names

Fix the opp table node names for opps to be compliant with bindings.

Signed-off-by: Nishanth Menon <nm@ti.com>
Message-ID: <20230724153911.1376830-4-nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
index b956e2f60fe0701bf35ccac55d0388017dc41a10..16b567e3cb4722c45131462a206ea686f73cc556 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/ti/omap/am335x-boneblack.dts
@@ -20,7 +20,8 @@
         * 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 {
+       opp-1000000000 {
+               /* OPP Nitro */
                opp-supported-hw = <0x06 0x0100>;
        };
 };

diff --git a/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
index 9863bf499a39e873f3484c0c5e4ffb236c829004..93a3af83feac79137c68cfad2c18249ef5b17940 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am335x-osd335x-common.dtsi
@@ -28,7 +28,8 @@
        * the HW OPP table, the silicon looks like it is Revision 1.0 (ie the
        * EFUSE_SMA register reads as all zeros).
        */
-       oppnitro-1000000000 {
+       opp-1000000000 {
+               /* OPP Nitro */
                opp-supported-hw = <0x06 0x0100>;
        };
 };

diff --git a/arch/arm/boot/dts/ti/omap/am33xx.dtsi b/arch/arm/boot/dts/ti/omap/am33xx.dtsi
index 32d397b3950b915d02173b7520842650ff7d43d3..1a2cd5baf402104b849fe93402d249ec403d4abd 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am33xx.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am33xx.dtsi
@@ -80,64 +80,74 @@
                 * because the can not be enabled simultaneously on a
                 * single SoC.
                 */
-               opp50-300000000 {
+               opp-50-300000000{
+                       /* OPP50 */
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <950000 931000 969000>;
                        opp-supported-hw = <0x06 0x0010>;
                        opp-suspend;
                };
 
-               opp100-275000000 {
+               opp-100-275000000{
+                       /* OPP100-1 */
                        opp-hz = /bits/ 64 <275000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x01 0x00FF>;
                        opp-suspend;
                };
 
-               opp100-300000000 {
+               opp-100-300000000{
+                       /* OPP100-2 */
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x06 0x0020>;
                        opp-suspend;
                };
 
-               opp100-500000000 {
+               opp-100-500000000{
+                       /* OPP100-3 */
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               opp100-600000000 {
+               opp-100-600000000 {
+                       /* OPP100-4 */
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0x06 0x0040>;
                };
 
-               opp120-600000000 {
+               opp-120-600000000 {
+                       /* OPP120-1 */
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               opp120-720000000 {
+               opp-120-720000000 {
+                       /* OPP120-2 */
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0x06 0x0080>;
                };
 
-               oppturbo-720000000 {
+               opp-720000000 {
+                       /* OPP Turbo-1 */
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0x01 0xFFFF>;
                };
 
-               oppturbo-800000000 {
+               opp-800000000 {
+                       /* OPP Turbo-2 */
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0x06 0x0100>;
                };
 
-               oppnitro-1000000000 {
+               opp-1000000000 {
+                       /* OPP Nitro */
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1325000 1298500 1351500>;
                        opp-supported-hw = <0x04 0x0200>;

diff --git a/arch/arm/boot/dts/ti/omap/am3517.dtsi b/arch/arm/boot/dts/ti/omap/am3517.dtsi
index 823f63502e9fe3e7652dd5ce63ad4b3ff75e6378..fbfc956f4e4d33e0d0cd678749f6e8e11db0060b 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am3517.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am3517.dtsi
@@ -34,14 +34,16 @@
                 * appear to operate at 300MHz as well. Since AM3517 only
                 * lists one operating voltage, it will remain fixed at 1.2V
                 */
-               opp50-300000000 {
+               opp-50-300000000 {
+                       /* OPP50 */
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <1200000>;
                        opp-supported-hw = <0xffffffff 0xffffffff>;
                        opp-suspend;
                };
 
-               opp100-600000000 {
+               opp-100-600000000 {
+                       /* OPP100 */
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1200000>;
                        opp-supported-hw = <0xffffffff 0xffffffff>;

diff --git a/arch/arm/boot/dts/ti/omap/am4372.dtsi b/arch/arm/boot/dts/ti/omap/am4372.dtsi
index 8613355bbd5ecd5e651ea467c8afa9ad3cd978a1..9d2c064534f7d1b6d42a50cc4df65419e2dc956c 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am4372.dtsi
+++ b/arch/arm/boot/dts/ti/omap/am4372.dtsi
@@ -70,32 +70,37 @@
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_conf>;
 
-               opp50-300000000 {
+               opp-50-300000000 {
+                       /* OPP50 */
                        opp-hz = /bits/ 64 <300000000>;
                        opp-microvolt = <950000 931000 969000>;
                        opp-supported-hw = <0xFF 0x01>;
                        opp-suspend;
                };
 
-               opp100-600000000 {
+               opp-100-600000000 {
+                       /* OPP100 */
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1100000 1078000 1122000>;
                        opp-supported-hw = <0xFF 0x04>;
                };
 
-               opp120-720000000 {
+               opp-120-720000000 {
+                       /* OPP120 */
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1200000 1176000 1224000>;
                        opp-supported-hw = <0xFF 0x08>;
                };
 
-               oppturbo-800000000 {
+               opp-800000000{
+                       /* OPP Turbo */
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1260000 1234800 1285200>;
                        opp-supported-hw = <0xFF 0x10>;
                };
 
-               oppnitro-1000000000 {
+               opp-1000000000 {
+                       /* OPP Nitro */
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1325000 1298500 1351500>;
                        opp-supported-hw = <0xFF 0x20>;

diff --git a/arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts b/arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
index edaddc7b6a5ee3ed4f249e0f942c04c71a891a94..00682ce7e14c4d23d962f30115af0a4ca4aa64e4 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
+++ b/arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
@@ -527,11 +527,13 @@
         * Supply voltage supervisor on board will not allow opp50 so
         * disable it and set opp100 as suspend OPP.
         */
-       opp50-300000000 {
+       opp-50-300000000 {
+               /* opp50-300000000 */
                status = "disabled";
        };
 
-       opp100-600000000 {
+       opp-100-600000000 {
+               /* opp100-600000000 */
                opp-suspend;
        };
 };

diff --git a/arch/arm/boot/dts/ti/omap/dra7.dtsi b/arch/arm/boot/dts/ti/omap/dra7.dtsi
index 97ce0c4f1df7e2874a3a4b1df279cbc4a414a741..3f3e52e3b37526eb41db0ea13b4c6c962864519b 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/dra7.dtsi
+++ b/arch/arm/boot/dts/ti/omap/dra7.dtsi
@@ -101,7 +101,8 @@
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_wkup>;
 
-               opp_nom-1000000000 {
+               opp-1000000000 {
+                       /* OPP NOM */
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1060000 850000 1150000>,
                                        <1060000 850000 1150000>;
@@ -109,7 +110,8 @@
                        opp-suspend;
                };
 
-               opp_od-1176000000 {
+               opp-1176000000 {
+                       /* OPP OD */
                        opp-hz = /bits/ 64 <1176000000>;
                        opp-microvolt = <1160000 885000 1160000>,
                                        <1160000 885000 1160000>;
@@ -117,7 +119,8 @@
                        opp-supported-hw = <0xFF 0x02>;
                };
 
-               opp_high@1500000000 {
+               opp-1500000000 {
+                       /* OPP High */
                        opp-hz = /bits/ 64 <1500000000>;
                        opp-microvolt = <1210000 950000 1250000>,
                                        <1210000 950000 1250000>;

diff --git a/arch/arm/boot/dts/ti/omap/dra76x.dtsi b/arch/arm/boot/dts/ti/omap/dra76x.dtsi
index 931db7932c115f2593033ed38087de1994c6da88..1045eb24aa0dbc2e81e8218371d669ce85a5235a 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/dra76x.dtsi
+++ b/arch/arm/boot/dts/ti/omap/dra76x.dtsi
@@ -130,7 +130,8 @@
 };
 
 &cpu0_opp_table {
-       opp_plus@1800000000 {
+       opp-1800000000 {
+               /* OPP Plus */
                opp-hz = /bits/ 64 <1800000000>;
                opp-microvolt = <1250000 950000 1250000>,
                                <1250000 950000 1250000>;

diff --git a/arch/arm/boot/dts/ti/omap/omap34xx.dtsi b/arch/arm/boot/dts/ti/omap/omap34xx.dtsi
index 9dbf62797f0f92fabd55a73855fa32fc135cfc42..fc7233ac183a8f5249a1d066cf401adfa947ebf1 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/omap34xx.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap34xx.dtsi
@@ -25,7 +25,7 @@
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_conf>;
 
-               opp1-125000000 {
+               opp-125000000 {
                        opp-hz = /bits/ 64 <125000000>;
                        /*
                         * we currently only select the max voltage from table
@@ -40,32 +40,32 @@
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp2-250000000 {
+               opp-250000000 {
                        opp-hz = /bits/ 64 <250000000>;
                        opp-microvolt = <1075000 1075000 1075000>;
                        opp-supported-hw = <0xffffffff 3>;
                        opp-suspend;
                };
 
-               opp3-500000000 {
+               opp-500000000 {
                        opp-hz = /bits/ 64 <500000000>;
                        opp-microvolt = <1200000 1200000 1200000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp4-550000000 {
+               opp-550000000 {
                        opp-hz = /bits/ 64 <550000000>;
                        opp-microvolt = <1275000 1275000 1275000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp5-600000000 {
+               opp-600000000 {
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1350000 1350000 1350000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp6-720000000 {
+               opp-720000000 {
                        opp-hz = /bits/ 64 <720000000>;
                        opp-microvolt = <1350000 1350000 1350000>;
                        /* only high-speed grade omap3530 devices */

diff --git a/arch/arm/boot/dts/ti/omap/omap36xx.dtsi b/arch/arm/boot/dts/ti/omap/omap36xx.dtsi
index 50e640a32b5c2ddeba1e4e72f26ec541c76b26ae..e6d8070c1bf88da462b326823c0fcda0acf2effe 100644 (file)
--- a/arch/arm/boot/dts/ti/omap/omap36xx.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap36xx.dtsi
@@ -30,7 +30,8 @@
                compatible = "operating-points-v2-ti-cpu";
                syscon = <&scm_conf>;
 
-               opp50-300000000 {
+               opp-50-300000000 {
+                       /* OPP50 */
                        opp-hz = /bits/ 64 <300000000>;
                        /*
                         * we currently only select the max voltage from table
@@ -48,21 +49,24 @@
                        opp-suspend;
                };
 
-               opp100-600000000 {
+               opp-100-600000000 {
+                       /* OPP100 */
                        opp-hz = /bits/ 64 <600000000>;
                        opp-microvolt = <1200000 1200000 1200000>,
                                         <1200000 1200000 1200000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp130-800000000 {
+               opp-130-800000000 {
+                       /* OPP130 */
                        opp-hz = /bits/ 64 <800000000>;
                        opp-microvolt = <1325000 1325000 1325000>,
                                         <1325000 1325000 1325000>;
                        opp-supported-hw = <0xffffffff 3>;
                };
 
-               opp1g-1000000000 {
+               opp-1000000000 {
+                       /* OPP1G */
                        opp-hz = /bits/ 64 <1000000000>;
                        opp-microvolt = <1375000 1375000 1375000>,
                                         <1375000 1375000 1375000>;