Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6953bb4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove SDPM and policy-engine support for YUPIK"

parents cb14b800 c6c0e850

qcom/yupik-thermal-overlay-qrd.dtsi

+56 −38
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ 
		};

	};



	pm8350b-ibat-lvl0 {

		trips {

			ibat-lvl0 {

				temperature = <5000>;

			};

		};

	};



	pm8350b-bcl-lvl0 {

		cooling-maps {

			vbat_cpu4 {
@@ -45,50 +53,55 @@ 
				cooling-device = <&cpu5_isolate 1 1>;

			};



			vbat_gpu0 {

			vbat_cpu6 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vbat_cdsp0 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cdsp_sw 2 2>;

			};



			vbat_modem0 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&modem_pa 2 2>;

			};



			vbat_modem1 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&modem_tj 1 1>;

			};

		};

	};



	pm8350b-bcl-lvl1 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

			vbat_gpu {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vbat_gpu1 {

			vbat_cdsp1 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

				cooling-device = <&cdsp_sw 4 4>;

			};



			vbat_cdsp1 {

			vbat_modem2 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cdsp_sw 4 4>;

				cooling-device = <&modem_tj 3 3>;

			};

		};

	};



	pm8350b-bcl-lvl2 {

		cooling-maps {

			vbat_gpu2 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vbat_cdsp2 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
@@ -110,39 +123,50 @@ 
				cooling-device = <&cpu5_isolate 1 1>;

			};



			vph_gpu0 {

			vph_cpu6 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vph_cdsp0 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&cdsp_sw 2 2>;

			};



			vph_modem0 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&modem_pa 2 2>;

			};



			vph_modem1 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&modem_tj 1 1>;

			};

		};

	};



	pm8350c-bcl-lvl1 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

			vph_gpu {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vph_gpu1 {

			vph_cdsp1 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

				cooling-device = <&cdsp_sw 4 4>;

			};



			vph_cdsp1 {

			vph_modem2 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&cdsp_sw 4 4>;

				cooling-device = <&modem_tj 3 3>;

			};

		};

	};
@@ -150,12 +174,6 @@ 
	pm8350c-bcl-lvl2 {

		disable-thermal-zone;

		cooling-maps {

			vph_gpu2 {

				trip = <&c_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vph_cdsp2 {

				trip = <&c_bcl_lvl2>;

				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT

qcom/yupik-thermal-overlay.dtsi

+32 −44
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ 
		};

	};



	pm7325b-ibat-lvl0 {

		trips {

			ibat-lvl0 {

				temperature = <5000>;

			};

		};

	};



	pm7325b-bcl-lvl0 {

		cooling-maps {

			vbat_cpu4 {
@@ -45,9 +53,14 @@ 
				cooling-device = <&cpu5_isolate 1 1>;

			};



			vbat_gpu0 {

			vbat_cpu6 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&b_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vbat_cdsp0 {
@@ -69,19 +82,10 @@ 


	pm7325b-bcl-lvl1 {

		cooling-maps {

			vbat_cpu6 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vbat_cpu7 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vbat_gpu1 {

			vbat_gpu {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vbat_cdsp1 {
@@ -89,7 +93,7 @@ 
				cooling-device = <&cdsp_sw 4 4>;

			};



			vbat_modem0 {

			vbat_modem2 {

				trip = <&b_bcl_lvl1>;

				cooling-device = <&modem_tj 3 3>;

			};
@@ -98,12 +102,6 @@ 


	pm7325b-bcl-lvl2 {

		cooling-maps {

			vbat_gpu2 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vbat_cdsp2 {

				trip = <&b_bcl_lvl2>;

				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT
@@ -125,9 +123,14 @@ 
				cooling-device = <&cpu5_isolate 1 1>;

			};



			vph_gpu0 {

			vph_cpu6 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&msm_gpu 2 2>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vph_cdsp0 {
@@ -135,12 +138,12 @@ 
				cooling-device = <&cdsp_sw 2 2>;

			};



			vbat_modem0 {

			vph_modem0 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&modem_pa 2 2>;

			};



			vbat_modem1 {

			vph_modem1 {

				trip = <&c_bcl_lvl0>;

				cooling-device = <&modem_tj 1 1>;

			};
@@ -150,19 +153,10 @@ 
	pm8350c-bcl-lvl1 {

		disable-thermal-zone;

		cooling-maps {

			vph_cpu6 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&cpu6_isolate 1 1>;

			};



			vph_cpu7 {

			vph_gpu {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&cpu7_isolate 1 1>;

			};



			vph_gpu1 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&msm_gpu 4 4>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vph_cdsp1 {
@@ -170,7 +164,7 @@ 
				cooling-device = <&cdsp_sw 4 4>;

			};



			vbat_modem0 {

			vph_modem2 {

				trip = <&c_bcl_lvl1>;

				cooling-device = <&modem_tj 3 3>;

			};
@@ -180,12 +174,6 @@ 
	pm8350c-bcl-lvl2 {

		disable-thermal-zone;

		cooling-maps {

			vph_gpu2 {

				trip = <&c_bcl_lvl2>;

				cooling-device = <&msm_gpu THERMAL_MAX_LIMIT

							THERMAL_MAX_LIMIT>;

			};



			vph_cdsp2 {

				trip = <&c_bcl_lvl2>;

				cooling-device = <&cdsp_sw THERMAL_MAX_LIMIT

qcom/yupik-thermal.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
			<&dispcc DISP_CC_MDSS_MDP_CLK_SRC>;

		cam_cc_ipe-supply = <&cam_cc_ipe_0_gdsc>;

		csr-id = <1 4>;

		status = "disabled";

	};



	cx_sdpm@0x00634000 {
@@ -80,6 +81,7 @@ 
			<&dispcc DISP_CC_MDSS_MDP_CLK_SRC>;

		cam_cc_ipe-supply = <&cam_cc_ipe_0_gdsc>;

		csr-id = <0 2>;

		status = "disabled";

	};



	mx_pe: mx_rdpm_pe@0x00637000 {
@@ -87,6 +89,7 @@ 
		#thermal-sensor-cells = <0>;

		reg = <0x00637000 0x1000>;

		interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};



	cx_pe: cx_rdpm_pe@0x00635000 {
@@ -94,6 +97,7 @@ 
		#thermal-sensor-cells = <0>;

		reg = <0x00635000 0x1000>;

		interrupts = <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

	};

};
@@ -1660,6 +1664,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&mx_pe>;

		thermal-governor = "step_wise";

		status = "disabled";

		trips {

			mx_pe_config1: mx-pe-config1 {

				temperature = <1>;
@@ -1723,6 +1728,7 @@ 
		polling-delay = <0>;

		thermal-sensors = <&cx_pe>;

		thermal-governor = "step_wise";

		status = "disabled";

		trips {

			cx_pe_config1: cx-pe-config1 {

				temperature = <1>;