Merge "ARM: dts: msm: Add 2.3 GHz performance cluster support on MSMCOBALT v2"

2 files changed, 126 insertions, 125 deletions

diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
index 8a8d65887441..cac11da9a962 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.dtsi
@@ -28,88 +28,89 @@
 	compatible = "qcom,cpu-clock-osm-msmcobalt-v2";
 	/delete-property/ qcom,llm-sw-overr;
 	qcom,pwrcl-speedbin0-v0 =
-		<   300000000 0x0004000f 0x01200020 0x1 >,
-		<   364800000 0x05040013 0x01200020 0x1 >,
-		<   441600000 0x05040017 0x02200020 0x1 >,
-		<   518400000 0x0504001b 0x02200020 0x1 >,
-		<   595200000 0x0504001f 0x02200020 0x1 >,
-		<   672000000 0x05040023 0x03200020 0x1 >,
-		<   748800000 0x05040027 0x03200020 0x1 >,
-		<   825600000 0x0404002b 0x03220022 0x1 >,
-		<   883200000 0x0404002e 0x04250025 0x1 >,
-		<   960000000 0x04040032 0x04280028 0x1 >,
-		<  1036800000 0x04040036 0x042b002b 0x1 >,
-		<  1094400000 0x04040039 0x052e002e 0x2 >,
-		<  1171200000 0x0404003d 0x05310031 0x2 >,
-		<  1248000000 0x04040041 0x05340034 0x2 >,
-		<  1324800000 0x04040045 0x06370037 0x2 >,
-		<  1401600000 0x04040049 0x063a003a 0x2 >,
-		<  1478400000 0x0404004d 0x073e003e 0x2 >,
-		<  1555200000 0x04040051 0x07410041 0x2 >,
-		<  1670400000 0x04040057 0x08460046 0x2 >,
-		<  1747200000 0x0404005b 0x08490049 0x2 >,
-		<  1824000000 0x0404005f 0x084c004c 0x3 >,
-		<  1900800000 0x04040063 0x094f004f 0x3 >;
+		<   300000000 0x0004000f 0x01200020 0x1 1 >,
+		<   364800000 0x05040013 0x01200020 0x1 2 >,
+		<   441600000 0x05040017 0x02200020 0x1 3 >,
+		<   518400000 0x0504001b 0x02200020 0x1 4 >,
+		<   595200000 0x0504001f 0x02200020 0x1 5 >,
+		<   672000000 0x05040023 0x03200020 0x1 6 >,
+		<   748800000 0x05040027 0x03200020 0x1 7 >,
+		<   825600000 0x0404002b 0x03220022 0x1 8 >,
+		<   883200000 0x0404002e 0x04250025 0x1 9 >,
+		<   960000000 0x04040032 0x04280028 0x1 10 >,
+		<  1036800000 0x04040036 0x042b002b 0x1 11 >,
+		<  1094400000 0x04040039 0x052e002e 0x2 12 >,
+		<  1171200000 0x0404003d 0x05310031 0x2 13 >,
+		<  1248000000 0x04040041 0x05340034 0x2 14 >,
+		<  1324800000 0x04040045 0x06370037 0x2 15 >,
+		<  1401600000 0x04040049 0x063a003a 0x2 16 >,
+		<  1478400000 0x0404004d 0x073e003e 0x2 17 >,
+		<  1555200000 0x04040051 0x07410041 0x2 18 >,
+		<  1670400000 0x04040057 0x08460046 0x2 19 >,
+		<  1747200000 0x0404005b 0x08490049 0x2 20 >,
+		<  1824000000 0x0404005f 0x084c004c 0x3 21 >,
+		<  1900800000 0x04040063 0x094f004f 0x3 22 >;
 
 	qcom,perfcl-speedbin0-v0 =
-		<   300000000 0x0004000f 0x01200020 0x1 >,
-		<   345600000 0x05040012 0x01200020 0x1 >,
-		<   422400000 0x05040016 0x02200020 0x1 >,
-		<   499200000 0x0504001a 0x02200020 0x1 >,
-		<   576000000 0x0504001e 0x02200020 0x1 >,
-		<   652800000 0x05040022 0x03200020 0x1 >,
-		<   729600000 0x05040026 0x03200020 0x1 >,
-		<   806400000 0x0504002a 0x03220022 0x1 >,
-		<   902400000 0x0404002f 0x04260026 0x1 >,
-		<   979200000 0x04040033 0x04290029 0x1 >,
-		<  1056000000 0x04040037 0x052c002c 0x1 >,
-		<  1132800000 0x0404003b 0x052f002f 0x1 >,
-		<  1190400000 0x0404003e 0x05320032 0x2 >,
-		<  1267200000 0x04040042 0x06350035 0x2 >,
-		<  1344000000 0x04040046 0x06380038 0x2 >,
-		<  1420800000 0x0404004a 0x063b003b 0x2 >,
-		<  1497600000 0x0404004e 0x073e003e 0x2 >,
-		<  1574400000 0x04040052 0x07420042 0x2 >,
-		<  1651200000 0x04040056 0x07450045 0x2 >,
-		<  1728000000 0x0404005a 0x08480048 0x2 >,
-		<  1804800000 0x0404005e 0x084b004b 0x2 >,
-		<  1881600000 0x04040062 0x094e004e 0x2 >,
-		<  1958400000 0x04040066 0x09520052 0x2 >,
-		<  2035200000 0x0404006a 0x09550055 0x3 >,
-		<  2112000000 0x0404006e 0x0a580058 0x3 >,
-		<  2188800000 0x04040072 0x0a5b005b 0x3 >,
-		<  2265600000 0x04040076 0x0a5e005e 0x3 >,
-		<  2342400000 0x0404007a 0x0a620062 0x3 >,
-		<  2419200000 0x0404007e 0x0a650065 0x3 >,
-		<  2496000000 0x04040082 0x0a680068 0x3 >;
+		<   300000000 0x0004000f 0x01200020 0x1 1 >,
+		<   345600000 0x05040012 0x01200020 0x1 2 >,
+		<   422400000 0x05040016 0x02200020 0x1 3 >,
+		<   499200000 0x0504001a 0x02200020 0x1 4 >,
+		<   576000000 0x0504001e 0x02200020 0x1 5 >,
+		<   652800000 0x05040022 0x03200020 0x1 6 >,
+		<   729600000 0x05040026 0x03200020 0x1 7 >,
+		<   806400000 0x0504002a 0x03220022 0x1 8 >,
+		<   902400000 0x0404002f 0x04260026 0x1 9 >,
+		<   979200000 0x04040033 0x04290029 0x1 10 >,
+		<  1056000000 0x04040037 0x052c002c 0x1 11 >,
+		<  1132800000 0x0404003b 0x052f002f 0x1 12 >,
+		<  1190400000 0x0404003e 0x05320032 0x2 13 >,
+		<  1267200000 0x04040042 0x06350035 0x2 14 >,
+		<  1344000000 0x04040046 0x06380038 0x2 15 >,
+		<  1420800000 0x0404004a 0x063b003b 0x2 16 >,
+		<  1497600000 0x0404004e 0x073e003e 0x2 17 >,
+		<  1574400000 0x04040052 0x07420042 0x2 18 >,
+		<  1651200000 0x04040056 0x07450045 0x2 19 >,
+		<  1728000000 0x0404005a 0x08480048 0x2 20 >,
+		<  1804800000 0x0404005e 0x084b004b 0x2 21 >,
+		<  1881600000 0x04040062 0x094e004e 0x2 22 >,
+		<  1958400000 0x04040066 0x09520052 0x2 23 >,
+		<  2035200000 0x0404006a 0x09550055 0x3 24 >,
+		<  2112000000 0x0404006e 0x0a580058 0x3 25 >,
+		<  2188800000 0x04040072 0x0a5b005b 0x3 26 >,
+		<  2265600000 0x04040076 0x0a5e005e 0x3 27 >,
+		<  2342400000 0x0404007a 0x0a620062 0x3 28 >,
+		<  2419200000 0x0404007e 0x0a650065 0x3 29 >,
+		<  2496000000 0x04040082 0x0a680068 0x3 30 >;
 
 	qcom,perfcl-speedbin1-v0 =
-		<   300000000 0x0004000f 0x01200020 0x1 >,
-		<   345600000 0x05040012 0x01200020 0x1 >,
-		<   422400000 0x05040016 0x02200020 0x1 >,
-		<   499200000 0x0504001a 0x02200020 0x1 >,
-		<   576000000 0x0504001e 0x02200020 0x1 >,
-		<   652800000 0x05040022 0x03200020 0x1 >,
-		<   729600000 0x05040026 0x03200020 0x1 >,
-		<   806400000 0x0504002a 0x03220022 0x1 >,
-		<   902400000 0x0404002f 0x04260026 0x1 >,
-		<   979200000 0x04040033 0x04290029 0x1 >,
-		<  1056000000 0x04040037 0x052c002c 0x1 >,
-		<  1132800000 0x0404003b 0x052f002f 0x1 >,
-		<  1190400000 0x0404003e 0x05320032 0x2 >,
-		<  1267200000 0x04040042 0x06350035 0x2 >,
-		<  1344000000 0x04040046 0x06380038 0x2 >,
-		<  1420800000 0x0404004a 0x063b003b 0x2 >,
-		<  1497600000 0x0404004e 0x073e003e 0x2 >,
-		<  1574400000 0x04040052 0x07420042 0x2 >,
-		<  1651200000 0x04040056 0x07450045 0x2 >,
-		<  1728000000 0x0404005a 0x08480048 0x2 >,
-		<  1804800000 0x0404005e 0x084b004b 0x2 >,
-		<  1881600000 0x04040062 0x094e004e 0x2 >,
-		<  1958400000 0x04040066 0x09520052 0x2 >,
-		<  2035200000 0x0404006a 0x09550055 0x3 >,
-		<  2112000000 0x0404006e 0x0a580058 0x3 >,
-		<  2208000000 0x04040073 0x0a5c005c 0x3 >;
+		<   300000000 0x0004000f 0x01200020 0x1 1 >,
+		<   345600000 0x05040012 0x01200020 0x1 2 >,
+		<   422400000 0x05040016 0x02200020 0x1 3 >,
+		<   499200000 0x0504001a 0x02200020 0x1 4 >,
+		<   576000000 0x0504001e 0x02200020 0x1 5 >,
+		<   652800000 0x05040022 0x03200020 0x1 6 >,
+		<   729600000 0x05040026 0x03200020 0x1 7 >,
+		<   806400000 0x0504002a 0x03220022 0x1 8 >,
+		<   902400000 0x0404002f 0x04260026 0x1 9 >,
+		<   979200000 0x04040033 0x04290029 0x1 10 >,
+		<  1056000000 0x04040037 0x052c002c 0x1 11 >,
+		<  1132800000 0x0404003b 0x052f002f 0x1 12 >,
+		<  1190400000 0x0404003e 0x05320032 0x2 13 >,
+		<  1267200000 0x04040042 0x06350035 0x2 14 >,
+		<  1344000000 0x04040046 0x06380038 0x2 15 >,
+		<  1420800000 0x0404004a 0x063b003b 0x2 16 >,
+		<  1497600000 0x0404004e 0x073e003e 0x2 17 >,
+		<  1574400000 0x04040052 0x07420042 0x2 18 >,
+		<  1651200000 0x04040056 0x07450045 0x2 19 >,
+		<  1728000000 0x0404005a 0x08480048 0x2 20 >,
+		<  1804800000 0x0404005e 0x084b004b 0x2 21 >,
+		<  1881600000 0x04040062 0x094e004e 0x2 22 >,
+		<  1958400000 0x04040066 0x09520052 0x2 23 >,
+		<  2035200000 0x0404006a 0x09550055 0x3 24 >,
+		<  2112000000 0x0404006e 0x0a580058 0x3 25 >,
+		<  2208000000 0x04040073 0x0a5c005c 0x3 26 >,
+		<  2304000000 0x04010078 0x0a5c005c 0x3 26 >;
 };
 
 &msm_cpufreq {
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
index d3f50aa267c5..33830aefcf36 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
@@ -823,55 +823,55 @@
 		interrupt-names = "pwrcl-irq", "perfcl-irq";
 
 		qcom,pwrcl-speedbin0-v0 =
-			<   300000000 0x0004000f 0x01200020 0x1 >,
-			<   345600000 0x05040012 0x02200020 0x1 >,
-			<   422400000 0x05040016 0x02200020 0x1 >,
-			<   499200000 0x0504001a 0x02200020 0x1 >,
-			<   576000000 0x0504001e 0x03200020 0x1 >,
-			<   633600000 0x05040021 0x03200020 0x1 >,
-			<   710400000 0x05040025 0x03200020 0x1 >,
-			<   806400000 0x0504002a 0x04200020 0x1 >,
-			<   883200000 0x0404002e 0x04250025 0x1 >,
-			<   960000000 0x04040032 0x05280028 0x1 >,
-			<  1036800000 0x04040036 0x052b002b 0x2 >,
-			<  1113600000 0x0404003a 0x052e002e 0x2 >,
-			<  1190400000 0x0404003e 0x06320032 0x2 >,
-			<  1248000000 0x04040041 0x06340034 0x2 >,
-			<  1324800000 0x04040045 0x06370037 0x2 >,
-			<  1401600000 0x04040049 0x073a003a 0x2 >,
-			<  1478400000 0x0404004d 0x073e003e 0x2 >,
-			<  1574400000 0x04040052 0x08420042 0x2 >,
-			<  1651200000 0x04040056 0x08450045 0x2 >,
-			<  1728000000 0x0404005a 0x08480048 0x2 >,
-			<  1804800000 0x0404005e 0x094b004b 0x3 >,
-			<  1881600000 0x04040062 0x094e004e 0x3 >;
+			<   300000000 0x0004000f 0x01200020 0x1 1 >,
+			<   345600000 0x05040012 0x02200020 0x1 2 >,
+			<   422400000 0x05040016 0x02200020 0x1 3 >,
+			<   499200000 0x0504001a 0x02200020 0x1 4 >,
+			<   576000000 0x0504001e 0x03200020 0x1 5 >,
+			<   633600000 0x05040021 0x03200020 0x1 6 >,
+			<   710400000 0x05040025 0x03200020 0x1 7 >,
+			<   806400000 0x0504002a 0x04200020 0x1 8 >,
+			<   883200000 0x0404002e 0x04250025 0x1 9 >,
+			<   960000000 0x04040032 0x05280028 0x1 10 >,
+			<  1036800000 0x04040036 0x052b002b 0x2 11 >,
+			<  1113600000 0x0404003a 0x052e002e 0x2 12 >,
+			<  1190400000 0x0404003e 0x06320032 0x2 13 >,
+			<  1248000000 0x04040041 0x06340034 0x2 14 >,
+			<  1324800000 0x04040045 0x06370037 0x2 15 >,
+			<  1401600000 0x04040049 0x073a003a 0x2 16 >,
+			<  1478400000 0x0404004d 0x073e003e 0x2 17 >,
+			<  1574400000 0x04040052 0x08420042 0x2 18 >,
+			<  1651200000 0x04040056 0x08450045 0x2 19 >,
+			<  1728000000 0x0404005a 0x08480048 0x2 20 >,
+			<  1804800000 0x0404005e 0x094b004b 0x3 21 >,
+			<  1881600000 0x04040062 0x094e004e 0x3 22 >;
 
 		qcom,perfcl-speedbin0-v0 =
-			<   300000000 0x0004000f 0x01200020 0x1 >,
-			<   345600000 0x05040012 0x02200020 0x1 >,
-			<   422400000 0x05040016 0x02200020 0x1 >,
-			<   480000000 0x05040019 0x02200020 0x1 >,
-			<   556800000 0x0504001d 0x03200020 0x1 >,
-			<   633600000 0x05040021 0x03200020 0x1 >,
-			<   710400000 0x05040025 0x03200020 0x1 >,
-			<   787200000 0x05040029 0x04200020 0x1 >,
-			<   844800000 0x0404002c 0x04230023 0x1 >,
-			<   902400000 0x0404002f 0x04260026 0x1 >,
-			<   979200000 0x04040033 0x05290029 0x1 >,
-			<  1056000000 0x04040037 0x052c002c 0x1 >,
-			<  1171200000 0x0404003d 0x06310031 0x2 >,
-			<  1248000000 0x04040041 0x06340034 0x2 >,
-			<  1324800000 0x04040045 0x06370037 0x2 >,
-			<  1401600000 0x04040049 0x073a003a 0x2 >,
-			<  1478400000 0x0404004d 0x073e003e 0x2 >,
-			<  1536000000 0x04040050 0x07400040 0x2 >,
-			<  1632000000 0x04040055 0x08440044 0x2 >,
-			<  1708800000 0x04040059 0x08470047 0x2 >,
-			<  1785600000 0x0404005d 0x094a004a 0x2 >,
-			<  1862400000 0x04040061 0x094e004e 0x2 >,
-			<  1939200000 0x04040065 0x09510051 0x3 >,
-			<  2016000000 0x04040069 0x0a540054 0x3 >,
-			<  2092800000 0x0404006d 0x0a570057 0x3 >;
+			<   300000000 0x0004000f 0x01200020 0x1 1 >,
+			<   345600000 0x05040012 0x02200020 0x1 2 >,
+			<   422400000 0x05040016 0x02200020 0x1 3 >,
+			<   480000000 0x05040019 0x02200020 0x1 4 >,
+			<   556800000 0x0504001d 0x03200020 0x1 5 >,
+			<   633600000 0x05040021 0x03200020 0x1 6 >,
+			<   710400000 0x05040025 0x03200020 0x1 7 >,
+			<   787200000 0x05040029 0x04200020 0x1 8 >,
+			<   844800000 0x0404002c 0x04230023 0x1 9 >,
+			<   902400000 0x0404002f 0x04260026 0x1 10 >,
+			<   979200000 0x04040033 0x05290029 0x1 11 >,
+			<  1056000000 0x04040037 0x052c002c 0x1 12 >,
+			<  1171200000 0x0404003d 0x06310031 0x2 13 >,
+			<  1248000000 0x04040041 0x06340034 0x2 14 >,
+			<  1324800000 0x04040045 0x06370037 0x2 15 >,
+			<  1401600000 0x04040049 0x073a003a 0x2 16 >,
+			<  1478400000 0x0404004d 0x073e003e 0x2 17 >,
+			<  1536000000 0x04040050 0x07400040 0x2 18 >,
+			<  1632000000 0x04040055 0x08440044 0x2 19 >,
+			<  1708800000 0x04040059 0x08470047 0x2 20 >,
+			<  1785600000 0x0404005d 0x094a004a 0x2 21 >,
+			<  1862400000 0x04040061 0x094e004e 0x2 22 >,
+			<  1939200000 0x04040065 0x09510051 0x3 23 >,
+			<  2016000000 0x04040069 0x0a540054 0x3 24 >,
+			<  2092800000 0x0404006d 0x0a570057 0x3 25 >;
 
 		qcom,up-timer =
 			<1000 1000>;