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

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

Merge "ARM: dts: msm: Update ADC channels for atoll"

parents 3da3cb63 96508c82

arch/arm64/boot/dts/qcom/atoll-atp.dtsi

+0 −51
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
};



&pm6150l_vadc {

	pinctrl-0 = <&camera_flash_therm_default &tof_therm_default>;



	pa_therm1 {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm1";
@@ -26,23 +24,6 @@ 
		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};



	tof_therm {

		reg = <ADC_GPIO3_PU2>;

		label = "tof_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm6150l_gpios {

	tof_therm {

		tof_therm_default: tof_therm_default {

			pins = "gpio7";

			bias-high-impedance;

		};

	};

};



&pm6150l_adc_tm {
@@ -129,23 +110,6 @@ 
	status = "ok";

};



&spmi_bus {

	qcom,pm6150l@4 {

		pm6150l_adc_tm_iio: adc_tm@3400 {

			compatible = "qcom,adc-tm5-iio";

			reg = <0x3400 0x100>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm6150l_vadc ADC_GPIO3_PU2>;



			tof_therm {

				reg = <ADC_GPIO3_PU2>;

				qcom,ratiometric;

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

			};

		};

	};

};



&thermal_zones {

	pa-therm1 {

		polling-delay-passive = <0>;
@@ -161,19 +125,4 @@ 
			};

		};

	};



	tof-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm_iio ADC_GPIO3_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/atoll-idp.dtsi

+0 −51
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
};



&pm6150l_vadc {

	pinctrl-0 = <&camera_flash_therm_default &tof_therm_default>;



	pa_therm1 {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm1";
@@ -34,23 +32,6 @@ 
		qcom,hw-settle-time = <200>;

		qcom,pre-scaling = <1 1>;

	};



	tof_therm {

		reg = <ADC_GPIO3_PU2>;

		label = "tof_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm6150l_gpios {

	tof_therm {

		tof_therm_default: tof_therm_default {

			pins = "gpio7";

			bias-high-impedance;

		};

	};

};



&pm6150l_adc_tm {
@@ -137,23 +118,6 @@ 
	status = "ok";

};



&spmi_bus {

	qcom,pm6150l@4 {

		pm6150l_adc_tm_iio: adc_tm@3400 {

			compatible = "qcom,adc-tm5-iio";

			reg = <0x3400 0x100>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm6150l_vadc ADC_GPIO3_PU2>;



			tof_therm {

				reg = <ADC_GPIO3_PU2>;

				qcom,ratiometric;

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

			};

		};

	};

};



&thermal_zones {

	pa-therm1 {

		polling-delay-passive = <0>;
@@ -169,21 +133,6 @@ 
			};

		};

	};



	tof-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm_iio ADC_GPIO3_PU2>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};



&pm6150a_amoled {

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

+7 −0
Original line number Diff line number Diff line
@@ -3283,6 +3283,13 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&nvm_therm_default &sdm_skin_therm_default>;



	smb1390_therm {

		reg = <ADC_AMUX_THM2>;

		label = "smb1390_therm";

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

		qcom,pre-scaling = <1 1>;

	};



	chg_skin_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "chg_skin_therm";