ARM: tegra: Pass multiple versions in opp-supported-hw property

We can now pass multiple versions in "opp-supported-hw" property, lets
do that and simplify the tables a bit.

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Tested-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi b/arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi
index dce85d3..6f3e8c5 100644 (file)
--- a/arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi
+++ b/arch/arm/boot/dts/tegra20-cpu-opp-microvolt.dtsi
@@ -26,14 +26,6 @@
                        opp-microvolt = <800000 800000 1125000>;
                };
 
-               opp@456000000,800,2,2 {
-                       opp-microvolt = <800000 800000 1125000>;
-               };
-
-               opp@456000000,800,3,2 {
-                       opp-microvolt = <800000 800000 1125000>;
-               };
-
                opp@456000000,825 {
                        opp-microvolt = <825000 825000 1125000>;
                };
@@ -46,10 +38,6 @@
                        opp-microvolt = <800000 800000 1125000>;
                };
 
-               opp@608000000,800,3,2 {
-                       opp-microvolt = <800000 800000 1125000>;
-               };
-
                opp@608000000,825 {
                        opp-microvolt = <825000 825000 1125000>;
                };
@@ -78,18 +66,6 @@
                        opp-microvolt = <875000 875000 1125000>;
                };
 
-               opp@760000000,875,1,1 {
-                       opp-microvolt = <875000 875000 1125000>;
-               };
-
-               opp@760000000,875,0,2 {
-                       opp-microvolt = <875000 875000 1125000>;
-               };
-
-               opp@760000000,875,1,2 {
-                       opp-microvolt = <875000 875000 1125000>;
-               };
-
                opp@760000000,900 {
                        opp-microvolt = <900000 900000 1125000>;
                };
@@ -134,14 +110,6 @@
                        opp-microvolt = <950000 950000 1125000>;
                };
 
-               opp@912000000,950,0,2 {
-                       opp-microvolt = <950000 950000 1125000>;
-               };
-
-               opp@912000000,950,2,2 {
-                       opp-microvolt = <950000 950000 1125000>;
-               };
-
                opp@912000000,1000 {
                        opp-microvolt = <1000000 1000000 1125000>;
                };
@@ -170,10 +138,6 @@
                        opp-microvolt = <1000000 1000000 1125000>;
                };
 
-               opp@1000000000,1000,0,2 {
-                       opp-microvolt = <1000000 1000000 1125000>;
-               };
-
                opp@1000000000,1025 {
                        opp-microvolt = <1025000 1025000 1125000>;
                };

diff --git a/arch/arm/boot/dts/tegra20-cpu-opp.dtsi b/arch/arm/boot/dts/tegra20-cpu-opp.dtsi
index 9b8fedb..702a635 100644 (file)
--- a/arch/arm/boot/dts/tegra20-cpu-opp.dtsi
+++ b/arch/arm/boot/dts/tegra20-cpu-opp.dtsi
@@ -37,19 +37,8 @@
 
                opp@456000000,800 {
                        clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x03 0x0006>;
-                       opp-hz = /bits/ 64 <456000000>;
-               };
-
-               opp@456000000,800,2,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <456000000>;
-               };
-
-               opp@456000000,800,3,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x08 0x0004>;
+                       opp-supported-hw = <0x03 0x0006>, <0x04 0x0004>,
+                                          <0x08 0x0004>;
                        opp-hz = /bits/ 64 <456000000>;
                };
 
@@ -67,13 +56,7 @@
 
                opp@608000000,800 {
                        clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x04 0x0006>;
-                       opp-hz = /bits/ 64 <608000000>;
-               };
-
-               opp@608000000,800,3,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x08 0x0004>;
+                       opp-supported-hw = <0x04 0x0006>, <0x08 0x0004>;
                        opp-hz = /bits/ 64 <608000000>;
                };
 
@@ -115,25 +98,8 @@
 
                opp@760000000,875 {
                        clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x04 0x0001>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,875,1,1 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x02 0x0002>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,875,0,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x01 0x0004>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,875,1,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x02 0x0004>;
+                       opp-supported-hw = <0x04 0x0001>, <0x02 0x0002>,
+                                          <0x01 0x0004>, <0x02 0x0004>;
                        opp-hz = /bits/ 64 <760000000>;
                };
 
@@ -199,19 +165,8 @@
 
                opp@912000000,950 {
                        clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x02 0x0006>;
-                       opp-hz = /bits/ 64 <912000000>;
-               };
-
-               opp@912000000,950,0,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x01 0x0004>;
-                       opp-hz = /bits/ 64 <912000000>;
-               };
-
-               opp@912000000,950,2,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x04 0x0004>;
+                       opp-supported-hw = <0x02 0x0006>, <0x01 0x0004>,
+                                          <0x04 0x0004>;
                        opp-hz = /bits/ 64 <912000000>;
                };
 
@@ -253,13 +208,7 @@
 
                opp@1000000000,1000 {
                        clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x02 0x0006>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,1000,0,2 {
-                       clock-latency-ns = <400000>;
-                       opp-supported-hw = <0x01 0x0004>;
+                       opp-supported-hw = <0x02 0x0006>, <0x01 0x0004>;
                        opp-hz = /bits/ 64 <1000000000>;
                };
 

diff --git a/arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi b/arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi
index d682f74..1be715d 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi
+++ b/arch/arm/boot/dts/tegra30-cpu-opp-microvolt.dtsi
@@ -74,22 +74,6 @@
                        opp-microvolt = <850000 850000 1250000>;
                };
 
-               opp@475000000,850,0,1 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@475000000,850,0,4 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@475000000,850,0,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@475000000,850,0,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
                opp@608000000,850 {
                        opp-microvolt = <850000 850000 1250000>;
                };
@@ -106,62 +90,6 @@
                        opp-microvolt = <850000 850000 1250000>;
                };
 
-               opp@640000000,850,1,1 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,2,1 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,3,1 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,1,4 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,2,4 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,3,4 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,1,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,2,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,3,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,4,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,1,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,2,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,3,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@640000000,850,4,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
                opp@640000000,900 {
                        opp-microvolt = <900000 900000 1250000>;
                };
@@ -170,94 +98,10 @@
                        opp-microvolt = <850000 850000 1250000>;
                };
 
-               opp@760000000,850,3,1 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,3,2 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,3,3 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,3,4 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,3,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,4,7 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,3,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,4,8 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
-               opp@760000000,850,0,10 {
-                       opp-microvolt = <850000 850000 1250000>;
-               };
-
                opp@760000000,900 {
                        opp-microvolt = <900000 900000 1250000>;
                };
 
-               opp@760000000,900,1,1 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,1 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,1,2 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,2 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,1,3 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,3 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,1,4 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,4 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,1,7 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,7 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,1,8 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@760000000,900,2,8 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
                opp@760000000,912 {
                        opp-microvolt = <912000 912000 1250000>;
                };
@@ -282,90 +126,10 @@
                        opp-microvolt = <900000 900000 1250000>;
                };
 
-               opp@860000000,900,2,1 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,1 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,2,2 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,2 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,2,3 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,3 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,2,4 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,4 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,2,7 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,7 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,4,7 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,2,8 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,3,8 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
-               opp@860000000,900,4,8 {
-                       opp-microvolt = <900000 900000 1250000>;
-               };
-
                opp@860000000,975 {
                        opp-microvolt = <975000 975000 1250000>;
                };
 
-               opp@860000000,975,1,1 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@860000000,975,1,2 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@860000000,975,1,3 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@860000000,975,1,4 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@860000000,975,1,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@860000000,975,1,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
                opp@860000000,1000 {
                        opp-microvolt = <1000000 1000000 1250000>;
                };
@@ -382,62 +146,6 @@
                        opp-microvolt = <975000 975000 1250000>;
                };
 
-               opp@1000000000,975,2,1 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,1 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,2,2 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,2 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,2,3 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,3 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,2,4 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,4 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,2,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,4,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,2,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,3,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1000000000,975,4,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
                opp@1000000000,1000 {
                        opp-microvolt = <1000000 1000000 1250000>;
                };
@@ -454,66 +162,10 @@
                        opp-microvolt = <975000 975000 1250000>;
                };
 
-               opp@1100000000,975,3,1 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,3,2 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,3,3 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,3,4 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,3,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,4,7 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,3,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
-               opp@1100000000,975,4,8 {
-                       opp-microvolt = <975000 975000 1250000>;
-               };
-
                opp@1100000000,1000 {
                        opp-microvolt = <1000000 1000000 1250000>;
                };
 
-               opp@1100000000,1000,2,1 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1100000000,1000,2,2 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1100000000,1000,2,3 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1100000000,1000,2,4 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1100000000,1000,2,7 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1100000000,1000,2,8 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
                opp@1100000000,1025 {
                        opp-microvolt = <1025000 1025000 1250000>;
                };
@@ -534,66 +186,10 @@
                        opp-microvolt = <1000000 1000000 1250000>;
                };
 
-               opp@1200000000,1000,3,1 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,3,2 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,3,3 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,3,4 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,3,7 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,4,7 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,3,8 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1200000000,1000,4,8 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
                opp@1200000000,1025 {
                        opp-microvolt = <1025000 1025000 1250000>;
                };
 
-               opp@1200000000,1025,2,1 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1200000000,1025,2,2 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1200000000,1025,2,3 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1200000000,1025,2,4 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1200000000,1025,2,7 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1200000000,1025,2,8 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
                opp@1200000000,1050 {
                        opp-microvolt = <1050000 1050000 1250000>;
                };
@@ -610,90 +206,18 @@
                        opp-microvolt = <1000000 1000000 1250000>;
                };
 
-               opp@1300000000,1000,4,7 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
-               opp@1300000000,1000,4,8 {
-                       opp-microvolt = <1000000 1000000 1250000>;
-               };
-
                opp@1300000000,1025 {
                        opp-microvolt = <1025000 1025000 1250000>;
                };
 
-               opp@1300000000,1025,3,1 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1300000000,1025,3,7 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
-               opp@1300000000,1025,3,8 {
-                       opp-microvolt = <1025000 1025000 1250000>;
-               };
-
                opp@1300000000,1050 {
                        opp-microvolt = <1050000 1050000 1250000>;
                };
 
-               opp@1300000000,1050,2,1 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,2 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,3 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,4 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,5 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,6 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,2,7 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,2,8 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,12 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
-               opp@1300000000,1050,3,13 {
-                       opp-microvolt = <1050000 1050000 1250000>;
-               };
-
                opp@1300000000,1075 {
                        opp-microvolt = <1075000 1075000 1250000>;
                };
 
-               opp@1300000000,1075,2,2 {
-                       opp-microvolt = <1075000 1075000 1250000>;
-               };
-
-               opp@1300000000,1075,2,3 {
-                       opp-microvolt = <1075000 1075000 1250000>;
-               };
-
-               opp@1300000000,1075,2,4 {
-                       opp-microvolt = <1075000 1075000 1250000>;
-               };
-
                opp@1300000000,1100 {
                        opp-microvolt = <1100000 1100000 1250000>;
                };
@@ -722,10 +246,6 @@
                        opp-microvolt = <1150000 1150000 1250000>;
                };
 
-               opp@1400000000,1150,2,4 {
-                       opp-microvolt = <1150000 1150000 1250000>;
-               };
-
                opp@1400000000,1175 {
                        opp-microvolt = <1175000 1175000 1250000>;
                };
@@ -738,42 +258,10 @@
                        opp-microvolt = <1125000 1125000 1250000>;
                };
 
-               opp@1500000000,1125,4,5 {
-                       opp-microvolt = <1125000 1125000 1250000>;
-               };
-
-               opp@1500000000,1125,4,6 {
-                       opp-microvolt = <1125000 1125000 1250000>;
-               };
-
-               opp@1500000000,1125,4,12 {
-                       opp-microvolt = <1125000 1125000 1250000>;
-               };
-
-               opp@1500000000,1125,4,13 {
-                       opp-microvolt = <1125000 1125000 1250000>;
-               };
-
                opp@1500000000,1150 {
                        opp-microvolt = <1150000 1150000 1250000>;
                };
 
-               opp@1500000000,1150,3,5 {
-                       opp-microvolt = <1150000 1150000 1250000>;
-               };
-
-               opp@1500000000,1150,3,6 {
-                       opp-microvolt = <1150000 1150000 1250000>;
-               };
-
-               opp@1500000000,1150,3,12 {
-                       opp-microvolt = <1150000 1150000 1250000>;
-               };
-
-               opp@1500000000,1150,3,13 {
-                       opp-microvolt = <1150000 1150000 1250000>;
-               };
-
                opp@1500000000,1200 {
                        opp-microvolt = <1200000 1200000 1250000>;
                };

diff --git a/arch/arm/boot/dts/tegra30-cpu-opp.dtsi b/arch/arm/boot/dts/tegra30-cpu-opp.dtsi
index 8e434f6..0f71350 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cpu-opp.dtsi
+++ b/arch/arm/boot/dts/tegra30-cpu-opp.dtsi
@@ -109,667 +109,188 @@
 
                opp@475000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x0F 0x0001>;
-                       opp-hz = /bits/ 64 <475000000>;
-               };
-
-               opp@475000000,850,0,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0002>;
-                       opp-hz = /bits/ 64 <475000000>;
-               };
-
-               opp@475000000,850,0,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0010>;
-                       opp-hz = /bits/ 64 <475000000>;
-               };
-
-               opp@475000000,850,0,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0080>;
-                       opp-hz = /bits/ 64 <475000000>;
-               };
-
-               opp@475000000,850,0,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0100>;
-                       opp-hz = /bits/ 64 <475000000>;
-               };
-
-               opp@608000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1F 0x0400>;
-                       opp-hz = /bits/ 64 <608000000>;
-               };
-
-               opp@608000000,912 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1F 0x0200>;
-                       opp-hz = /bits/ 64 <608000000>;
-               };
-
-               opp@620000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1E 0x306C>;
-                       opp-hz = /bits/ 64 <620000000>;
-               };
-
-               opp@640000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x0F 0x0001>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,1,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0002>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,1,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0010>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,1,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0080>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,4,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,1,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0100>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,2,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,3,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,850,4,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@640000000,900 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0192>;
-                       opp-hz = /bits/ 64 <640000000>;
-               };
-
-               opp@760000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1E 0x3461>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,4,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,3,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,4,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,850,0,10 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0400>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0001>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0002>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0004>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0008>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0010>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0080>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,1,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0100>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,900,2,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,912 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1F 0x0200>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@760000000,975 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0192>;
-                       opp-hz = /bits/ 64 <760000000>;
-               };
-
-               opp@816000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1F 0x0400>;
-                       opp-hz = /bits/ 64 <816000000>;
-               };
-
-               opp@816000000,912 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x1F 0x0200>;
-                       opp-hz = /bits/ 64 <816000000>;
-               };
-
-               opp@860000000,850 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x0C 0x0001>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0001>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,4,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,2,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,3,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,900,4,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0001>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0002>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0004>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0008>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0010>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0080>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,975,1,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0100>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@860000000,1000 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0192>;
-                       opp-hz = /bits/ 64 <860000000>;
-               };
-
-               opp@910000000,900 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x18 0x3060>;
-                       opp-hz = /bits/ 64 <910000000>;
-               };
-
-               opp@1000000000,900 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x0C 0x0001>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x03 0x0001>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,2,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,3,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,2,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,3,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <1000000000>;
-               };
-
-               opp@1000000000,975,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x0F 0x0001>, <0x01 0x0002>,
+                                          <0x01 0x0010>, <0x01 0x0080>,
+                                          <0x01 0x0100>;
+                       opp-hz = /bits/ 64 <475000000>;
                };
 
-               opp@1000000000,975,4,7 {
+               opp@608000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x1F 0x0400>;
+                       opp-hz = /bits/ 64 <608000000>;
                };
 
-               opp@1000000000,975,2,8 {
+               opp@608000000,912 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x1F 0x0200>;
+                       opp-hz = /bits/ 64 <608000000>;
                };
 
-               opp@1000000000,975,3,8 {
+               opp@620000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x1E 0x306C>;
+                       opp-hz = /bits/ 64 <620000000>;
                };
 
-               opp@1000000000,975,4,8 {
+               opp@640000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x0F 0x0001>, <0x02 0x0002>,
+                                          <0x04 0x0002>, <0x08 0x0002>,
+                                          <0x02 0x0010>, <0x04 0x0010>,
+                                          <0x08 0x0010>, <0x02 0x0080>,
+                                          <0x04 0x0080>, <0x08 0x0080>,
+                                          <0x10 0x0080>, <0x02 0x0100>,
+                                          <0x04 0x0100>, <0x08 0x0100>,
+                                          <0x10 0x0100>;
+                       opp-hz = /bits/ 64 <640000000>;
                };
 
-               opp@1000000000,1000 {
+               opp@640000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x019E>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x01 0x0192>;
+                       opp-hz = /bits/ 64 <640000000>;
                };
 
-               opp@1000000000,1025 {
+               opp@760000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0192>;
-                       opp-hz = /bits/ 64 <1000000000>;
+                       opp-supported-hw = <0x1E 0x3461>, <0x08 0x0002>,
+                                          <0x08 0x0004>, <0x08 0x0008>,
+                                          <0x08 0x0010>, <0x08 0x0080>,
+                                          <0x10 0x0080>, <0x08 0x0100>,
+                                          <0x10 0x0100>, <0x01 0x0400>;
+                       opp-hz = /bits/ 64 <760000000>;
                };
 
-               opp@1100000000,900 {
+               opp@760000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0001>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x01 0x0001>, <0x02 0x0002>,
+                                          <0x04 0x0002>, <0x02 0x0004>,
+                                          <0x04 0x0004>, <0x02 0x0008>,
+                                          <0x04 0x0008>, <0x02 0x0010>,
+                                          <0x04 0x0010>, <0x02 0x0080>,
+                                          <0x04 0x0080>, <0x02 0x0100>,
+                                          <0x04 0x0100>;
+                       opp-hz = /bits/ 64 <760000000>;
                };
 
-               opp@1100000000,975 {
+               opp@760000000,912 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x06 0x0001>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x1F 0x0200>;
+                       opp-hz = /bits/ 64 <760000000>;
                };
 
-               opp@1100000000,975,3,1 {
+               opp@760000000,975 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x01 0x0192>;
+                       opp-hz = /bits/ 64 <760000000>;
                };
 
-               opp@1100000000,975,3,2 {
+               opp@816000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x1F 0x0400>;
+                       opp-hz = /bits/ 64 <816000000>;
                };
 
-               opp@1100000000,975,3,3 {
+               opp@816000000,912 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x1F 0x0200>;
+                       opp-hz = /bits/ 64 <816000000>;
                };
 
-               opp@1100000000,975,3,4 {
+               opp@860000000,850 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x0C 0x0001>;
+                       opp-hz = /bits/ 64 <860000000>;
                };
 
-               opp@1100000000,975,3,7 {
+               opp@860000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x02 0x0001>, <0x04 0x0002>,
+                                          <0x08 0x0002>, <0x04 0x0004>,
+                                          <0x08 0x0004>, <0x04 0x0008>,
+                                          <0x08 0x0008>, <0x04 0x0010>,
+                                          <0x08 0x0010>, <0x04 0x0080>,
+                                          <0x08 0x0080>, <0x10 0x0080>,
+                                          <0x04 0x0100>, <0x08 0x0100>,
+                                          <0x10 0x0100>;
+                       opp-hz = /bits/ 64 <860000000>;
                };
 
-               opp@1100000000,975,4,7 {
+               opp@860000000,975 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x01 0x0001>, <0x02 0x0002>,
+                                          <0x02 0x0004>, <0x02 0x0008>,
+                                          <0x02 0x0010>, <0x02 0x0080>,
+                                          <0x02 0x0100>;
+                       opp-hz = /bits/ 64 <860000000>;
                };
 
-               opp@1100000000,975,3,8 {
+               opp@860000000,1000 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x01 0x0192>;
+                       opp-hz = /bits/ 64 <860000000>;
                };
 
-               opp@1100000000,975,4,8 {
+               opp@910000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x18 0x3060>;
+                       opp-hz = /bits/ 64 <910000000>;
                };
 
-               opp@1100000000,1000 {
+               opp@1000000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x01 0x0001>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x0C 0x0001>;
+                       opp-hz = /bits/ 64 <1000000000>;
                };
 
-               opp@1100000000,1000,2,1 {
+               opp@1000000000,975 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x03 0x0001>, <0x04 0x0002>,
+                                          <0x08 0x0002>, <0x04 0x0004>,
+                                          <0x08 0x0004>, <0x04 0x0008>,
+                                          <0x08 0x0008>, <0x04 0x0010>,
+                                          <0x08 0x0010>, <0x04 0x0080>,
+                                          <0x08 0x0080>, <0x10 0x0080>,
+                                          <0x04 0x0100>, <0x08 0x0100>,
+                                          <0x10 0x0100>;
+                       opp-hz = /bits/ 64 <1000000000>;
                };
 
-               opp@1100000000,1000,2,2 {
+               opp@1000000000,1000 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x02 0x019E>;
+                       opp-hz = /bits/ 64 <1000000000>;
                };
 
-               opp@1100000000,1000,2,3 {
+               opp@1000000000,1025 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <1100000000>;
+                       opp-supported-hw = <0x01 0x0192>;
+                       opp-hz = /bits/ 64 <1000000000>;
                };
 
-               opp@1100000000,1000,2,4 {
+               opp@1100000000,900 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
+                       opp-supported-hw = <0x08 0x0001>;
                        opp-hz = /bits/ 64 <1100000000>;
                };
 
-               opp@1100000000,1000,2,7 {
+               opp@1100000000,975 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
+                       opp-supported-hw = <0x06 0x0001>, <0x08 0x0002>,
+                                          <0x08 0x0004>, <0x08 0x0008>,
+                                          <0x08 0x0010>, <0x08 0x0080>,
+                                          <0x10 0x0080>, <0x08 0x0100>,
+                                          <0x10 0x0100>;
                        opp-hz = /bits/ 64 <1100000000>;
                };
 
-               opp@1100000000,1000,2,8 {
+               opp@1100000000,1000 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
+                       opp-supported-hw = <0x01 0x0001>, <0x04 0x0002>,
+                                          <0x04 0x0004>, <0x04 0x0008>,
+                                          <0x04 0x0010>, <0x04 0x0080>,
+                                          <0x04 0x0100>;
                        opp-hz = /bits/ 64 <1100000000>;
                };
 
@@ -799,97 +320,20 @@
 
                opp@1200000000,1000 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0001>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,4,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,3,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1000,4,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
+                       opp-supported-hw = <0x04 0x0001>, <0x08 0x0002>,
+                                          <0x08 0x0004>, <0x08 0x0008>,
+                                          <0x08 0x0010>, <0x08 0x0080>,
+                                          <0x10 0x0080>, <0x08 0x0100>,
+                                          <0x10 0x0100>;
                        opp-hz = /bits/ 64 <1200000000>;
                };
 
                opp@1200000000,1025 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0001>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <1200000000>;
-               };
-
-               opp@1200000000,1025,2,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
+                       opp-supported-hw = <0x02 0x0001>, <0x04 0x0002>,
+                                          <0x04 0x0004>, <0x04 0x0008>,
+                                          <0x04 0x0010>, <0x04 0x0080>,
+                                          <0x04 0x0100>;
                        opp-hz = /bits/ 64 <1200000000>;
                };
 
@@ -913,133 +357,33 @@
 
                opp@1300000000,1000 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0001>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1000,4,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0080>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1000,4,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0100>;
+                       opp-supported-hw = <0x08 0x0001>, <0x10 0x0080>,
+                                          <0x10 0x0100>;
                        opp-hz = /bits/ 64 <1300000000>;
                };
 
                opp@1300000000,1025 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0001>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1025,3,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0002>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1025,3,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0080>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1025,3,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0100>;
+                       opp-supported-hw = <0x04 0x0001>, <0x08 0x0002>,
+                                          <0x08 0x0080>, <0x08 0x0100>;
                        opp-hz = /bits/ 64 <1300000000>;
                };
 
                opp@1300000000,1050 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x12 0x3061>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,2,1 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0002>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0004>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0008>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,5 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0020>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,6 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0040>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,2,7 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0080>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,2,8 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0100>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,12 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x1000>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1050,3,13 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x2000>;
+                       opp-supported-hw = <0x12 0x3061>, <0x04 0x0002>,
+                                          <0x08 0x0004>, <0x08 0x0008>,
+                                          <0x08 0x0010>, <0x08 0x0020>,
+                                          <0x08 0x0040>, <0x04 0x0080>,
+                                          <0x04 0x0100>, <0x08 0x1000>,
+                                          <0x08 0x2000>;
                        opp-hz = /bits/ 64 <1300000000>;
                };
 
                opp@1300000000,1075 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x0182>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1075,2,2 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0004>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1075,2,3 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0008>;
-                       opp-hz = /bits/ 64 <1300000000>;
-               };
-
-               opp@1300000000,1075,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
+                       opp-supported-hw = <0x02 0x0182>, <0x04 0x0004>,
+                                          <0x04 0x0008>, <0x04 0x0010>;
                        opp-hz = /bits/ 64 <1300000000>;
                };
 
@@ -1081,13 +425,7 @@
 
                opp@1400000000,1150 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x02 0x000C>;
-                       opp-hz = /bits/ 64 <1400000000>;
-               };
-
-               opp@1400000000,1150,2,4 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
+                       opp-supported-hw = <0x02 0x000C>, <0x04 0x0010>;
                        opp-hz = /bits/ 64 <1400000000>;
                };
 
@@ -1105,61 +443,17 @@
 
                opp@1500000000,1125 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0010>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1125,4,5 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0020>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1125,4,6 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x0040>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1125,4,12 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x1000>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1125,4,13 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x10 0x2000>;
+                       opp-supported-hw = <0x08 0x0010>, <0x10 0x0020>,
+                                          <0x10 0x0040>, <0x10 0x1000>,
+                                          <0x10 0x2000>;
                        opp-hz = /bits/ 64 <1500000000>;
                };
 
                opp@1500000000,1150 {
                        clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x04 0x0010>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1150,3,5 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0020>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1150,3,6 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x0040>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1150,3,12 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x1000>;
-                       opp-hz = /bits/ 64 <1500000000>;
-               };
-
-               opp@1500000000,1150,3,13 {
-                       clock-latency-ns = <100000>;
-                       opp-supported-hw = <0x08 0x2000>;
+                       opp-supported-hw = <0x04 0x0010>, <0x08 0x0020>,
+                                          <0x08 0x0040>, <0x08 0x1000>,
+                                          <0x08 0x2000>;
                        opp-hz = /bits/ 64 <1500000000>;
                };