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

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

Merge "ARM: dts: msm: Update ADC thermistors for Kona"

parents 671c11cf 161722f4

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

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

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";
@@ -402,6 +394,14 @@ 
		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";
@@ -458,8 +458,10 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

	io-channels = <&pm8150b_vadc ADC_AMUX_THM3_PU2>;



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};
@@ -469,6 +471,16 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

			<&pm8150_vadc ADC_AMUX_THM1_PU2>,

			<&pm8150_vadc ADC_AMUX_THM2_PU2>;



	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;
@@ -578,11 +590,25 @@ 
};



&thermal_zones {

	wp-therm-usr {

	conn-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -620,7 +646,7 @@ 
		};

	};



	camera-flash-therm-usr {

	camera-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

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

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

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";
@@ -304,6 +296,14 @@ 
		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";
@@ -360,8 +360,10 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

	io-channels = <&pm8150b_vadc ADC_AMUX_THM3_PU2>;



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};
@@ -371,6 +373,16 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

			<&pm8150_vadc ADC_AMUX_THM1_PU2>,

			<&pm8150_vadc ADC_AMUX_THM2_PU2>;



	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;
@@ -488,11 +500,25 @@ 
};



&thermal_zones {

	wp-therm-usr {

	conn-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -530,7 +556,7 @@ 
		};

	};



	camera-flash-therm-usr {

	camera-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

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

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

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";
@@ -372,6 +364,14 @@ 
		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";
@@ -428,8 +428,10 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

	io-channels = <&pm8150b_vadc ADC_AMUX_THM3_PU2>;



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};
@@ -439,6 +441,16 @@ 
	#address-cells = <1>;

	#size-cells = <0>;



	io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

			<&pm8150_vadc ADC_AMUX_THM1_PU2>,

			<&pm8150_vadc ADC_AMUX_THM2_PU2>;



	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;
@@ -509,11 +521,25 @@ 
};



&thermal_zones {

	wp-therm-usr {

	conn-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM3_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	xo-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		thermal-sensors = <&pm8150_adc_tm ADC_XO_THERM_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -551,7 +577,7 @@ 
		};

	};



	camera-flash-therm-usr {

	camera-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

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

+0 −1
Original line number Diff line number Diff line
@@ -420,7 +420,6 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150b_vadc ADC_AMUX_THM1_PU2>;

			qcom,pmic-revid = <&pm8150b_revid>;

		};

	};