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

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

Merge "ARM: dts: msm: Add ADC_TM thermal nodes on SM8150"

parents de6fbeae eb30628a

Documentation/devicetree/bindings/iio/adc/qcom,spmi-adc5.txt

+16 −1
Original line number Diff line number Diff line
@@ -12,9 +12,18 @@ ADC node: 
		Should contain "qcom,spmi-adc-rev2" for PMIC refresh ADC driver.



- reg:

    Usage: required

    Usage: required for VADC base address

    Value type: <prop-encoded-array>

    Definition: VADC base address and length in the SPMI PMIC register map.

                ADC_CAL base address and length in SPMI PMIC register map.

                ADC_CAL base is optional and is dependent on USB_IN_V channel

                read sequence for the PMIC.



- reg-names

    Usage: required

    Value type: <string>

    Definition: Names associated with base addresses. should be

                "adc5-usr-base", "adc5-cal-base".



- #address-cells:

    Usage: required
@@ -38,6 +47,12 @@ ADC node: 
    Value type: <prop-encoded-array>

    Definition: End of conversion interrupt.



- qcom,pmic-revid:

    Usage: optional

    Value type:<u32>

    Definition: phandle pointing to the revision peripheral node. Use it to query the

                PMIC type and revision.



Channel node properties:



- reg:

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

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>;

			io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

					<&pm8150_vadc ADC_AMUX_THM1_PU2>,

					<&pm8150_vadc ADC_AMUX_THM2_PU2>;

		};

	};

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

+4 −3
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ 


		pm8150b_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100 0x100>;

			reg = <0x3100 0x100>, <0x3700 0x100>;

			reg-names = "adc5-usr-base", "adc5-cal-base";

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;
@@ -157,8 +158,8 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150b_vadc ADC_AMUX_THM2_PU2>;

			status = "disabled";

			io-channels = <&pm8150b_vadc ADC_AMUX_THM1_PU2>;

			qcom,pmic-revid = <&pm8150b_revid>;

		};



		pm8150b_charger: qcom,qpnp-smb5 {

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

+42 −2
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ 


&pm8150b_adc_tm {

	wp_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};
@@ -467,6 +467,18 @@ 
		qcom,ratiometric;

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

	};



	skin_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm1 {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150l_adc_tm {
@@ -494,7 +506,7 @@ 
		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM2_PU2>;

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -518,6 +530,34 @@ 
		};

	};



	skin-therm {

		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 {

		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 {

		polling-delay-passive = <0>;

		polling-delay = <0>;

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

+42 −2
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ 


&pm8150b_adc_tm {

	wp_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};
@@ -466,6 +466,18 @@ 
		qcom,ratiometric;

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

	};



	skin_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm1 {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150l_adc_tm {
@@ -493,7 +505,7 @@ 
		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM2_PU2>;

		thermal-sensors = <&pm8150b_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;
@@ -517,6 +529,34 @@ 
		};

	};



	skin-therm {

		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 {

		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 {

		polling-delay-passive = <0>;

		polling-delay = <0>;