Commit 5821d766 authored by Nishanth Menon's avatar Nishanth Menon Committed by Tony Lindgren

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: default avatarNishanth Menon <nm@ti.com>
Message-ID: <20230724153911.1376830-4-nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 22de06ae
...@@ -20,7 +20,8 @@ &cpu0_opp_table { ...@@ -20,7 +20,8 @@ &cpu0_opp_table {
* BeagleBone Blacks have PG 2.0 silicon which is guaranteed * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
* to support 1GHz OPP so enable it for PG 2.0 on this board. * 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>; opp-supported-hw = <0x06 0x0100>;
}; };
}; };
......
...@@ -28,7 +28,8 @@ &cpu0_opp_table { ...@@ -28,7 +28,8 @@ &cpu0_opp_table {
* the HW OPP table, the silicon looks like it is Revision 1.0 (ie the * the HW OPP table, the silicon looks like it is Revision 1.0 (ie the
* EFUSE_SMA register reads as all zeros). * EFUSE_SMA register reads as all zeros).
*/ */
oppnitro-1000000000 { opp-1000000000 {
/* OPP Nitro */
opp-supported-hw = <0x06 0x0100>; opp-supported-hw = <0x06 0x0100>;
}; };
}; };
......
...@@ -80,64 +80,74 @@ cpu0_opp_table: opp-table { ...@@ -80,64 +80,74 @@ cpu0_opp_table: opp-table {
* because the can not be enabled simultaneously on a * because the can not be enabled simultaneously on a
* single SoC. * single SoC.
*/ */
opp50-300000000 { opp-50-300000000{
/* OPP50 */
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <950000 931000 969000>; opp-microvolt = <950000 931000 969000>;
opp-supported-hw = <0x06 0x0010>; opp-supported-hw = <0x06 0x0010>;
opp-suspend; opp-suspend;
}; };
opp100-275000000 { opp-100-275000000{
/* OPP100-1 */
opp-hz = /bits/ 64 <275000000>; opp-hz = /bits/ 64 <275000000>;
opp-microvolt = <1100000 1078000 1122000>; opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x01 0x00FF>; opp-supported-hw = <0x01 0x00FF>;
opp-suspend; opp-suspend;
}; };
opp100-300000000 { opp-100-300000000{
/* OPP100-2 */
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <1100000 1078000 1122000>; opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x06 0x0020>; opp-supported-hw = <0x06 0x0020>;
opp-suspend; opp-suspend;
}; };
opp100-500000000 { opp-100-500000000{
/* OPP100-3 */
opp-hz = /bits/ 64 <500000000>; opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <1100000 1078000 1122000>; opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x01 0xFFFF>; opp-supported-hw = <0x01 0xFFFF>;
}; };
opp100-600000000 { opp-100-600000000 {
/* OPP100-4 */
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1100000 1078000 1122000>; opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0x06 0x0040>; opp-supported-hw = <0x06 0x0040>;
}; };
opp120-600000000 { opp-120-600000000 {
/* OPP120-1 */
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1200000 1176000 1224000>; opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0x01 0xFFFF>; opp-supported-hw = <0x01 0xFFFF>;
}; };
opp120-720000000 { opp-120-720000000 {
/* OPP120-2 */
opp-hz = /bits/ 64 <720000000>; opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1200000 1176000 1224000>; opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0x06 0x0080>; opp-supported-hw = <0x06 0x0080>;
}; };
oppturbo-720000000 { opp-720000000 {
/* OPP Turbo-1 */
opp-hz = /bits/ 64 <720000000>; opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1260000 1234800 1285200>; opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0x01 0xFFFF>; opp-supported-hw = <0x01 0xFFFF>;
}; };
oppturbo-800000000 { opp-800000000 {
/* OPP Turbo-2 */
opp-hz = /bits/ 64 <800000000>; opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1260000 1234800 1285200>; opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0x06 0x0100>; opp-supported-hw = <0x06 0x0100>;
}; };
oppnitro-1000000000 { opp-1000000000 {
/* OPP Nitro */
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1325000 1298500 1351500>; opp-microvolt = <1325000 1298500 1351500>;
opp-supported-hw = <0x04 0x0200>; opp-supported-hw = <0x04 0x0200>;
......
...@@ -34,14 +34,16 @@ cpu0_opp_table: opp-table { ...@@ -34,14 +34,16 @@ cpu0_opp_table: opp-table {
* appear to operate at 300MHz as well. Since AM3517 only * appear to operate at 300MHz as well. Since AM3517 only
* lists one operating voltage, it will remain fixed at 1.2V * lists one operating voltage, it will remain fixed at 1.2V
*/ */
opp50-300000000 { opp-50-300000000 {
/* OPP50 */
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <1200000>; opp-microvolt = <1200000>;
opp-supported-hw = <0xffffffff 0xffffffff>; opp-supported-hw = <0xffffffff 0xffffffff>;
opp-suspend; opp-suspend;
}; };
opp100-600000000 { opp-100-600000000 {
/* OPP100 */
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1200000>; opp-microvolt = <1200000>;
opp-supported-hw = <0xffffffff 0xffffffff>; opp-supported-hw = <0xffffffff 0xffffffff>;
......
...@@ -70,32 +70,37 @@ cpu0_opp_table: opp-table { ...@@ -70,32 +70,37 @@ cpu0_opp_table: opp-table {
compatible = "operating-points-v2-ti-cpu"; compatible = "operating-points-v2-ti-cpu";
syscon = <&scm_conf>; syscon = <&scm_conf>;
opp50-300000000 { opp-50-300000000 {
/* OPP50 */
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
opp-microvolt = <950000 931000 969000>; opp-microvolt = <950000 931000 969000>;
opp-supported-hw = <0xFF 0x01>; opp-supported-hw = <0xFF 0x01>;
opp-suspend; opp-suspend;
}; };
opp100-600000000 { opp-100-600000000 {
/* OPP100 */
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1100000 1078000 1122000>; opp-microvolt = <1100000 1078000 1122000>;
opp-supported-hw = <0xFF 0x04>; opp-supported-hw = <0xFF 0x04>;
}; };
opp120-720000000 { opp-120-720000000 {
/* OPP120 */
opp-hz = /bits/ 64 <720000000>; opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1200000 1176000 1224000>; opp-microvolt = <1200000 1176000 1224000>;
opp-supported-hw = <0xFF 0x08>; opp-supported-hw = <0xFF 0x08>;
}; };
oppturbo-800000000 { opp-800000000{
/* OPP Turbo */
opp-hz = /bits/ 64 <800000000>; opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1260000 1234800 1285200>; opp-microvolt = <1260000 1234800 1285200>;
opp-supported-hw = <0xFF 0x10>; opp-supported-hw = <0xFF 0x10>;
}; };
oppnitro-1000000000 { opp-1000000000 {
/* OPP Nitro */
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1325000 1298500 1351500>; opp-microvolt = <1325000 1298500 1351500>;
opp-supported-hw = <0xFF 0x20>; opp-supported-hw = <0xFF 0x20>;
......
...@@ -527,11 +527,13 @@ &cpu0_opp_table { ...@@ -527,11 +527,13 @@ &cpu0_opp_table {
* Supply voltage supervisor on board will not allow opp50 so * Supply voltage supervisor on board will not allow opp50 so
* disable it and set opp100 as suspend OPP. * disable it and set opp100 as suspend OPP.
*/ */
opp50-300000000 { opp-50-300000000 {
/* opp50-300000000 */
status = "disabled"; status = "disabled";
}; };
opp100-600000000 { opp-100-600000000 {
/* opp100-600000000 */
opp-suspend; opp-suspend;
}; };
}; };
......
...@@ -101,7 +101,8 @@ cpu0_opp_table: opp-table { ...@@ -101,7 +101,8 @@ cpu0_opp_table: opp-table {
compatible = "operating-points-v2-ti-cpu"; compatible = "operating-points-v2-ti-cpu";
syscon = <&scm_wkup>; syscon = <&scm_wkup>;
opp_nom-1000000000 { opp-1000000000 {
/* OPP NOM */
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1060000 850000 1150000>, opp-microvolt = <1060000 850000 1150000>,
<1060000 850000 1150000>; <1060000 850000 1150000>;
...@@ -109,7 +110,8 @@ opp_nom-1000000000 { ...@@ -109,7 +110,8 @@ opp_nom-1000000000 {
opp-suspend; opp-suspend;
}; };
opp_od-1176000000 { opp-1176000000 {
/* OPP OD */
opp-hz = /bits/ 64 <1176000000>; opp-hz = /bits/ 64 <1176000000>;
opp-microvolt = <1160000 885000 1160000>, opp-microvolt = <1160000 885000 1160000>,
<1160000 885000 1160000>; <1160000 885000 1160000>;
...@@ -117,7 +119,8 @@ opp_od-1176000000 { ...@@ -117,7 +119,8 @@ opp_od-1176000000 {
opp-supported-hw = <0xFF 0x02>; opp-supported-hw = <0xFF 0x02>;
}; };
opp_high@1500000000 { opp-1500000000 {
/* OPP High */
opp-hz = /bits/ 64 <1500000000>; opp-hz = /bits/ 64 <1500000000>;
opp-microvolt = <1210000 950000 1250000>, opp-microvolt = <1210000 950000 1250000>,
<1210000 950000 1250000>; <1210000 950000 1250000>;
......
...@@ -130,7 +130,8 @@ &mmc3 { ...@@ -130,7 +130,8 @@ &mmc3 {
}; };
&cpu0_opp_table { &cpu0_opp_table {
opp_plus@1800000000 { opp-1800000000 {
/* OPP Plus */
opp-hz = /bits/ 64 <1800000000>; opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1250000 950000 1250000>, opp-microvolt = <1250000 950000 1250000>,
<1250000 950000 1250000>; <1250000 950000 1250000>;
......
...@@ -25,7 +25,7 @@ cpu0_opp_table: opp-table { ...@@ -25,7 +25,7 @@ cpu0_opp_table: opp-table {
compatible = "operating-points-v2-ti-cpu"; compatible = "operating-points-v2-ti-cpu";
syscon = <&scm_conf>; syscon = <&scm_conf>;
opp1-125000000 { opp-125000000 {
opp-hz = /bits/ 64 <125000000>; opp-hz = /bits/ 64 <125000000>;
/* /*
* we currently only select the max voltage from table * we currently only select the max voltage from table
...@@ -40,32 +40,32 @@ opp1-125000000 { ...@@ -40,32 +40,32 @@ opp1-125000000 {
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp2-250000000 { opp-250000000 {
opp-hz = /bits/ 64 <250000000>; opp-hz = /bits/ 64 <250000000>;
opp-microvolt = <1075000 1075000 1075000>; opp-microvolt = <1075000 1075000 1075000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
opp-suspend; opp-suspend;
}; };
opp3-500000000 { opp-500000000 {
opp-hz = /bits/ 64 <500000000>; opp-hz = /bits/ 64 <500000000>;
opp-microvolt = <1200000 1200000 1200000>; opp-microvolt = <1200000 1200000 1200000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp4-550000000 { opp-550000000 {
opp-hz = /bits/ 64 <550000000>; opp-hz = /bits/ 64 <550000000>;
opp-microvolt = <1275000 1275000 1275000>; opp-microvolt = <1275000 1275000 1275000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp5-600000000 { opp-600000000 {
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1350000 1350000 1350000>; opp-microvolt = <1350000 1350000 1350000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp6-720000000 { opp-720000000 {
opp-hz = /bits/ 64 <720000000>; opp-hz = /bits/ 64 <720000000>;
opp-microvolt = <1350000 1350000 1350000>; opp-microvolt = <1350000 1350000 1350000>;
/* only high-speed grade omap3530 devices */ /* only high-speed grade omap3530 devices */
......
...@@ -30,7 +30,8 @@ cpu0_opp_table: opp-table { ...@@ -30,7 +30,8 @@ cpu0_opp_table: opp-table {
compatible = "operating-points-v2-ti-cpu"; compatible = "operating-points-v2-ti-cpu";
syscon = <&scm_conf>; syscon = <&scm_conf>;
opp50-300000000 { opp-50-300000000 {
/* OPP50 */
opp-hz = /bits/ 64 <300000000>; opp-hz = /bits/ 64 <300000000>;
/* /*
* we currently only select the max voltage from table * we currently only select the max voltage from table
...@@ -48,21 +49,24 @@ opp50-300000000 { ...@@ -48,21 +49,24 @@ opp50-300000000 {
opp-suspend; opp-suspend;
}; };
opp100-600000000 { opp-100-600000000 {
/* OPP100 */
opp-hz = /bits/ 64 <600000000>; opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <1200000 1200000 1200000>, opp-microvolt = <1200000 1200000 1200000>,
<1200000 1200000 1200000>; <1200000 1200000 1200000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp130-800000000 { opp-130-800000000 {
/* OPP130 */
opp-hz = /bits/ 64 <800000000>; opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1325000 1325000 1325000>, opp-microvolt = <1325000 1325000 1325000>,
<1325000 1325000 1325000>; <1325000 1325000 1325000>;
opp-supported-hw = <0xffffffff 3>; opp-supported-hw = <0xffffffff 3>;
}; };
opp1g-1000000000 { opp-1000000000 {
/* OPP1G */
opp-hz = /bits/ 64 <1000000000>; opp-hz = /bits/ 64 <1000000000>;
opp-microvolt = <1375000 1375000 1375000>, opp-microvolt = <1375000 1375000 1375000>,
<1375000 1375000 1375000>; <1375000 1375000 1375000>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment