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

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

Merge "ARM: dts: msm: Remove support for XO_THERM for kona"

parents 334b7b5e 5cc88285

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+86 −14
Original line number Diff line number Diff line
@@ -236,14 +236,6 @@ 
		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";
@@ -311,12 +303,6 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;
@@ -403,3 +389,89 @@ 
		"SpkrLeft IN", "WSA_SPK1 OUT",

		"SpkrRight IN", "WSA_SPK2 OUT";

};



&thermal_zones {

	wp-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-flash-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-msm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+86 −14
Original line number Diff line number Diff line
@@ -228,14 +228,6 @@ 
		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";
@@ -303,12 +295,6 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;
@@ -367,3 +353,89 @@ 
&sde_dsi {

	qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>;

};



&thermal_zones {

	wp-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-flash-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-msm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/kona-qrd.dtsi

+86 −14
Original line number Diff line number Diff line
@@ -236,14 +236,6 @@ 
		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";
@@ -311,12 +303,6 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

		qcom,hw-settle-time = <200>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;
@@ -366,3 +352,89 @@ 
&sde_dsi {

	qcom,dsi-default-panel = <&dsi_sw43404_amoled_cmd>;

};



&thermal_zones {

	wp-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-flash-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-msm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/kona-thermal.dtsi

+0 −99
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */



#include <dt-bindings/thermal/thermal.h>

#include "kona-pmic-overlay.dtsi"



&thermal_zones {

	aoss0-usr {
@@ -356,102 +355,4 @@ 
			};

		};

	};



	wp-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	xo-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm1-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-flash-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	skin-msm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	pa-therm2-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150l_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/pm8150.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

					<&pm8150_vadc ADC_AMUX_THM1_PU2>,

			io-channels = <&pm8150_vadc ADC_AMUX_THM1_PU2>,

					<&pm8150_vadc ADC_AMUX_THM2_PU2>;

		};

	};