Bazinga Merge

.gitignore

@@ -82,6 +82,11 @@ GRTAGS
 GSYMS
 GTAGS
 
+*.rej
+*.diff
+*.patch
+*.list
+out/*
 *.orig
 *~
 \#*#

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

@@ -410,6 +410,7 @@
 	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
 	qcom,partial-update-enabled;
 	qcom,panel-roi-alignment = <720 128 720 64 720 64>;
+	qcom,panel-allow-phy-poweroff;
 };
 
 &dsi_nt35950_4k_dsc_cmd {
@@ -438,6 +439,7 @@
 	qcom,mdss-dsi-bl-min-level = <1>;
 	qcom,mdss-dsi-bl-max-level = <4095>;
 	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
+	qcom,panel-allow-phy-poweroff;
 };
 
 &dsi_dual_sharp_1080_120hz_cmd {

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

@@ -398,6 +398,7 @@
 	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
 	qcom,partial-update-enabled;
 	qcom,panel-roi-alignment = <720 128 720 64 720 64>;
+	qcom,panel-allow-phy-poweroff;
 };
 
 &dsi_nt35950_4k_dsc_cmd {
@@ -426,6 +427,7 @@
 	qcom,mdss-dsi-bl-min-level = <1>;
 	qcom,mdss-dsi-bl-max-level = <4095>;
 	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
+	qcom,panel-allow-phy-poweroff;
 };
 
 &dsi_dual_sharp_1080_120hz_cmd {

arch/arm/boot/dts/qcom/msm8996-pm.dtsi

@@ -48,8 +48,8 @@
 				label = "system-wfi";
 				qcom,psci-mode = <0>;
 				qcom,latency-us = <100>;
-				qcom,ss-power = <725>;
-				qcom,energy-overhead = <85000>;
+				qcom,ss-power = <192>;
+				qcom,energy-overhead = <60000>;
 				qcom,time-overhead = <120>;
 			};
 			qcom,pm-cluster-level@1{ /* E3-M2 */
@@ -59,9 +59,9 @@
 				qcom,spm-l3-mode = "fpc";
 				qcom,psci-mode = <0x23>;
 				qcom,latency-us = <350>;
-				qcom,ss-power = <530>;
-				qcom,energy-overhead = <160000>;
-				qcom,time-overhead = <550>;
+				qcom,ss-power = <160>;
+				qcom,energy-overhead = <69000>;
+				qcom,time-overhead = <150>;
 				qcom,min-child-idx = <1>;
 			};
 			qcom,pm-cluster-level@2{ /* E4-M3 */
@@ -71,9 +71,9 @@
 				qcom,spm-l3-mode = "fpc";
 				qcom,psci-mode = <0x34>;
 				qcom,latency-us = <11000>;
-				qcom,ss-power = <120>;
-				qcom,energy-overhead = <280000>;
-				qcom,time-overhead = <3200>;
+				qcom,ss-power = <72>;
+				qcom,energy-overhead = <1380000>;
+				qcom,time-overhead = <1200>;
 				qcom,min-child-idx = <2>;
 				qcom,notify-rpm;
 				qcom,is-reset;
@@ -95,7 +95,7 @@
 					label = "pwr-l2-wfi";
 					qcom,psci-mode = <1>;
 					qcom,latency-us = <40>;
-					qcom,ss-power = <740>;
+					qcom,ss-power = <195>;
 					qcom,energy-overhead = <65000>;
 					qcom,time-overhead = <85>;
 				};
@@ -105,21 +105,21 @@
 					label = "pwr-l2-gdhs";
 					qcom,psci-mode = <3>;
 					qcom,latency-us = <90>;
-					qcom,ss-power = <660>;
-					qcom,energy-overhead = <135000>;
+					qcom,ss-power = <180>;
+					qcom,energy-overhead = <89070>;
 					qcom,time-overhead = <180>;
-					qcom,min-child-idx = <1>;
+					qcom,min-child-idx = <2>;
 				};
 
 				qcom,pm-cluster-level@2{ /* D4 */
 					reg = <2>;
 					label = "pwr-l2-fpc";
 					qcom,psci-mode = <4>;
 					qcom,latency-us = <700>;
-					qcom,ss-power = <450>;
-					qcom,energy-overhead = <210000>;
-					qcom,time-overhead = <11500>;
-					qcom,min-child-idx = <1>;
+					qcom,ss-power = <160>;
+					qcom,energy-overhead = <441000>;
+					qcom,time-overhead = <1000>;
+					qcom,min-child-idx = <2>;
 					qcom,is-reset;
 				};
 
@@ -134,19 +134,30 @@
 						qcom,psci-cpu-mode = <1>;
 						qcom,spm-cpu-mode = "wfi";
 						qcom,latency-us = <20>;
-						qcom,ss-power = <750>;
-						qcom,energy-overhead = <32000>;
+						qcom,ss-power = <200>;
+						qcom,energy-overhead = <9000>;
 						qcom,time-overhead = <60>;
 					};
 
 					qcom,pm-cpu-level@1 {  /* C4 */
 						reg = <1>;
+						qcom,spm-cpu-mode = "fpc-def";
+						qcom,psci-cpu-mode = <4>;
+						qcom,latency-us = <40>;
+						qcom,ss-power = <198>;
+						qcom,energy-overhead = <21850>;
+						qcom,time-overhead = <120>;
+						qcom,hyp-psci;
+					};
+
+					qcom,pm-cpu-level@2 {  /* C4 */
+						reg = <2>;
 						qcom,spm-cpu-mode = "fpc";
 						qcom,psci-cpu-mode = <4>;
 						qcom,latency-us = <80>;
-						qcom,ss-power = <700>;
-						qcom,energy-overhead = <126480>;
-						qcom,time-overhead = <160>;
+						qcom,ss-power = <196>;
+						qcom,energy-overhead = <45300>;
+						qcom,time-overhead = <210>;
 					};
 				};
 			};
@@ -167,31 +178,31 @@
 					label = "perf-l2-wfi";
 					qcom,psci-mode = <1>;
 					qcom,latency-us = <40>;
-					qcom,ss-power = <740>;
-					qcom,energy-overhead = <70000>;
-					qcom,time-overhead = <80>;
+					qcom,ss-power = <195>;
+					qcom,energy-overhead = <65000>;
+					qcom,time-overhead = <85>;
 				};
 
 				qcom,pm-cluster-level@1{ /* D3 */
 					reg = <1>;
 					label = "perf-l2-gdhs";
 					qcom,psci-mode = <3>;
 					qcom,latency-us = <80>;
-					qcom,ss-power = <660>;
-					qcom,energy-overhead = <142000>;
+					qcom,ss-power = <180>;
+					qcom,energy-overhead = <83500>;
 					qcom,time-overhead = <180>;
-					qcom,min-child-idx = <1>;
+					qcom,min-child-idx = <2>;
 				};
 
 				qcom,pm-cluster-level@2{ /* D4 */
 					reg = <2>;
 					label = "perf-l2-fpc";
 					qcom,psci-mode = <4>;
 					qcom,latency-us = <800>;
-					qcom,ss-power = <450>;
-					qcom,energy-overhead = <240000>;
-					qcom,time-overhead = <11500>;
-					qcom,min-child-idx = <1>;
+					qcom,ss-power = <160>;
+					qcom,energy-overhead = <441000>;
+					qcom,time-overhead = <1000>;
+					qcom,min-child-idx = <2>;
 					qcom,is-reset;
 				};
 
@@ -206,19 +217,30 @@
 						qcom,psci-cpu-mode = <1>;
 						qcom,spm-cpu-mode = "wfi";
 						qcom,latency-us = <25>;
-						qcom,ss-power = <750>;
-						qcom,energy-overhead = <37000>;
-						qcom,time-overhead = <50>;
+						qcom,ss-power = <200>;
+						qcom,energy-overhead = <9000>;
+						qcom,time-overhead = <60>;
 					};
 
-					qcom,pm-cpu-level@1 { /* C4 */
+					qcom,pm-cpu-level@1 {  /* C4 */
 						reg = <1>;
+						qcom,spm-cpu-mode = "fpc-def";
+						qcom,psci-cpu-mode = <4>;
+						qcom,latency-us = <40>;
+						qcom,ss-power = <198>;
+						qcom,energy-overhead = <21850>;
+						qcom,time-overhead = <120>;
+						qcom,hyp-psci;
+					};
+
+					qcom,pm-cpu-level@2 {  /* C4 */
+						reg = <2>;
 						qcom,spm-cpu-mode = "fpc";
 						qcom,psci-cpu-mode = <4>;
 						qcom,latency-us = <80>;
-						qcom,ss-power = <700>;
-						qcom,energy-overhead = <136480>;
-						qcom,time-overhead = <160>;
+						qcom,ss-power = <196>;
+						qcom,energy-overhead = <45300>;
+						qcom,time-overhead = <210>;
 					};
 				};
 			};

arch/arm/boot/dts/qcom/msm8996.dtsi

@@ -2438,7 +2438,7 @@
 				<55 512 3936000 393600>;
 		clock-names = "core_clk_src", "core_clk",
 				"iface_clk", "bus_clk";
-		clocks = <&clock_gcc clk_ce1_clk>,
+		clocks = <&clock_gcc clk_qcrypto_ce1_clk>,
 			 <&clock_gcc clk_qcrypto_ce1_clk>,
 			 <&clock_gcc clk_gcc_ce1_ahb_m_clk>,
 			 <&clock_gcc clk_gcc_ce1_axi_m_clk>;
@@ -2468,7 +2468,7 @@
 				<55 512 3936000 393600>;
 		clock-names = "core_clk_src", "core_clk",
 				"iface_clk", "bus_clk";
-		clocks = <&clock_gcc clk_ce1_clk>,
+		clocks = <&clock_gcc clk_qcedev_ce1_clk>,
 			 <&clock_gcc clk_qcedev_ce1_clk>,
 			 <&clock_gcc clk_gcc_ce1_ahb_m_clk>,
 			 <&clock_gcc clk_gcc_ce1_axi_m_clk>;

arch/arm/configs/msm8937-perf_defconfig

@@ -470,7 +470,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y

arch/arm/configs/msm8937_defconfig

@@ -474,7 +474,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y

arch/arm/configs/msmcortex-perf_defconfig

@@ -468,7 +468,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y

arch/arm/configs/msmcortex_defconfig

@@ -466,7 +466,6 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_MSM_AVTIMER=y
 CONFIG_MSM_BUS_SCALING=y
-CONFIG_MSM_BUSPM_DEV=m
 CONFIG_BUS_TOPOLOGY_ADHOC=y
 CONFIG_QPNP_POWER_ON=y
 CONFIG_QPNP_REVID=y

arch/arm64/Kconfig

@@ -625,9 +625,7 @@ config ARCH_NR_GPIO
 
 source kernel/Kconfig.preempt
 
-config HZ
-	int
-	default 100
+source kernel/Kconfig.hz
 
 config ARCH_HAS_HOLES_MEMORYMODEL
 	def_bool y if SPARSEMEM

arch/arm64/boot/dts/15801_DVT/msm8996-v3.dtsi

@@ -395,7 +395,8 @@
 			< 1324800000 13 >,
 			< 1401600000 14 >,
 			< 1478400000 15 >,
-			< 1593600000 16 >;
+			< 1593600000 16 >,
+			< 1728000000 16 >;
 		qcom,pwrcl-speedbin1-v0 =
 			<          0  0 >,
 			<  307200000  1 >,
@@ -437,7 +438,8 @@
 			< 1920000000 22 >,
 			< 1996800000 23 >,
 			< 2073600000 24 >,
-			< 2150400000 25 >;
+			< 2150400000 25 >,
+			< 2265600000 25 >;
 		qcom,perfcl-speedbin1-v0 =
 			<          0  0 >,
 			<  307200000  1 >,
@@ -518,7 +520,8 @@
 		< 1324800 >,
 		< 1401600 >,
 		< 1478400 >,
-		< 1593600 >;
+		< 1593600 >,
+		< 1728000 >;
 	qcom,cpufreq-table-2 =
 		<  307200 >,
 		<  403200 >,
@@ -544,7 +547,8 @@
 		< 1920000 >,
 		< 1996800 >,
 		< 2073600 >,
-		< 2150400 >;
+		< 2150400 >,
+		< 2265600 >;
 };
 
 &m4m_cache {
@@ -588,7 +592,8 @@
 			< 1324800  1056000 >,
 			< 1401600  1132800 >,
 			< 1478400  1190400 >,
-			< 1593600  1382400 >;
+			< 1593600  1382400 >,
+			< 1728000  1382400 >;
 		cpu-to-dev-map-2 =
 			<  480000  307200 >,
 			<  556800  307200 >,
@@ -612,15 +617,17 @@
 			< 1920000 1459200 >,
 			< 1996800 1593600 >,
 			< 2073600 1593600 >,
-			< 2150400 1593600 >;
+			< 2150400 1593600 >,
+			< 2265600 1593600 >;
 	};
 
 	mincpubw-cpufreq {
 		cpu-to-dev-map-0 =
-			< 1593600 1525 >;
+			< 1728000 1525 >;
 		cpu-to-dev-map-2 =
 			< 2073600 1525 >,
-			< 2150400 5195 >;
+			< 2150400 5195 >,
+			< 2265600 5195 >;
 	};
 };