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

Commit c29a1b81 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 2de4181f on remote branch 

Change-Id: Ic5df4372d78834ab52868185ed293691b45dc6c0
parents 4af4ea24 2de4181f

qcom/khaje-idp-pm8010.dtsi

+0 −4
Original line number Diff line number Diff line 
&soc {

};



&qupv3_se1_i2c {

	qcom,clk-freq-out = <100000>;

};



&pm8008_regulators {

	compatible = "qcom,pm8010-regulator";

};

qcom/khaje-qrd-pm7250b.dtsi

+31 −0
Original line number Diff line number Diff line
@@ -159,3 +159,34 @@ 
&usb0 {

	extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>;

};



&thermal_zones {

	quiet-therm-step {

		cooling-maps {

			quiet_batt_cdev1 {

				trip = <&skin_batt_trip0>;

				cooling-device = <&pm7250b_charger 8 8>;

			};



			quiet_batt_cdev2 {

				trip = <&skin_batt_trip1>;

				cooling-device = <&pm7250b_charger 12 12>;

			};



			quiet_batt_cdev3 {

				trip = <&skin_batt_trip2>;

				cooling-device = <&pm7250b_charger 14 14>;

			};



			quiet_batt_cdev4 {

				trip = <&skin_batt_trip3>;

				cooling-device = <&pm7250b_charger 16 16>;

			};



			quiet_batt_cdev5 {

				trip = <&skin_batt_trip4>;

				cooling-device = <&pm7250b_charger 18 18>;

			};

		};

	};

};

qcom/khaje-qrd.dtsi

+150 −1
Original line number Diff line number Diff line
@@ -323,15 +323,164 @@ 
};



&thermal_zones {

	/delete-node/ quiet-therm-step;



	quiet-therm-step {

		status = "ok";

		polling-delay-passive = <2000>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC_AMUX_THM2_PU2>;

		wake-capable-sensor;



		trips {

			skin_batt_trip0: batt-trip0 {

				temperature = <41000>;

				hysteresis = <2000>;

				type = "passive";

			};



			skin_modem_trip0: modem-trip0 {

				temperature = <42000>;

				hysteresis = <2000>;

				type = "passive";

			};



			skin_batt_trip1: batt-trip1 {

				temperature = <43000>;

				hysteresis = <2000>;

				type = "passive";

			};



			skin_batt_trip2: batt-trip2 {

				temperature = <45000>;

				hysteresis = <2000>;

				type = "passive";

			};



			skin_gold_trip: gold-trip {

				temperature = <47000>;

				hysteresis = <0>;

				type = "passive";

			};



			skin_batt_trip3: batt-trip3 {

				temperature = <47000>;

				hysteresis = <2000>;

				type = "passive";

			};



			skin_batt_trip4: batt-trip4 {

				temperature = <48000>;

				hysteresis = <1000>;

				type = "passive";

			};



			skin_gpu_trip: gpu-trip {

				temperature = <48000>;

				hysteresis = <4000>;

				type = "passive";

			};



			skin_silver_trip: silver-trip {

				temperature = <50000>;

				hysteresis = <0>;

				type = "passive";

			};



			skin_hvx_trip: hvx-trip {

				temperature = <52000>;

				hysteresis = <4000>;

				type = "passive";

			};



			skin_modem_trip1: modem-trip1 {

				temperature = <60000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			gold_cdev {

				trip = <&skin_gold_trip>;

				/* limit to 1766400khz */

				cooling-device = <&CPU4 THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-4)>;

			};



			silver_cdev {

				trip = <&skin_silver_trip>;

				/* limit to 1516800khz */

				cooling-device = <&CPU0 THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-4)>;

			};



			gpu_cdev {

				trip = <&skin_gpu_trip>;

				/* limit 785000000hz */

				cooling-device = <&msm_gpu THERMAL_NO_LIMIT

							(THERMAL_MAX_LIMIT-3)>;

			};



			hvx_cdev {

				trip = <&skin_hvx_trip>;

				cooling-device = <&cdsp_sw 4 4>;

			};



			mdm_cdev0 {

				trip = <&skin_modem_trip0>;

				cooling-device = <&modem_proc 1 1>;

			};



			mdm_cdev1 {

				trip = <&skin_modem_trip1>;

				cooling-device = <&modem_proc 3 3>;

			};

		};

	};



	pa-therm0-step {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "step_wise";

		thermal-sensors = <&pm6125_adc_tm ADC_AMUX_THM1_PU2>;

		wake-capable-sensor;



		trips {

			pa_therm0_trip0: pa-therm0-trip0 {

				temperature = <52000>;

				hysteresis = <2000>;

				type = "passive";

			};



			pa_therm0_trip1: pa-therm0-trip1 {

				temperature = <54000>;

				hysteresis = <2000>;

				type = "passive";

			};



			pa_therm0_trip2: pa-therm0-trip2 {

				temperature = <60000>;

				hysteresis = <4000>;

				type = "passive";

			};

		};



		cooling-maps {

			modem_cdev0 {

				trip = <&pa_therm0_trip0>;

				cooling-device = <&modem_pa 1 1>;

			};



			modem_cdev1 {

				trip = <&pa_therm0_trip1>;

				cooling-device = <&modem_pa 2 2>;

			};



			modem_cdev2 {

				trip = <&pa_therm0_trip2>;

				cooling-device = <&modem_pa 3 3>;

			};

		};

	};

};

qcom/khaje-sde-display.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ 


	msm_notifier: qcom,msm_notifier@0 {

		compatible = "qcom,msm-notifier";

		panel = <&dsi_nt36672e_fhd_plus_90hz_video>;

		panel = <&dsi_nt36672e_fhd_plus_90hz_video

			&dsi_nt36672e_fhd_plus_120hz_video>;

	};

};

qcom/khaje-usb.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 
		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

		qcom,gsi-disable-io-coherency;



		qcom,pm-qos-latency = <43>; /* CPU0-WFI-LVL latency +1 */



		qcom,msm-bus,name = "usb0";

		qcom,msm-bus,num-cases = <4>;

		qcom,msm-bus,num-paths = <3>;