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

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

Merge "ARM: dts: msm: Correct thermistor names on PM6125 for trinket"

parents ec0348d9 17a75e26

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

+2 −2
Original line number Diff line number Diff line
@@ -158,14 +158,14 @@ 
		};

	};



	emmc-ufs-therm-adc {

	camera-ftherm-adc {

		polling-delay-passive = <0>;

		polling-delay = <5000>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6125_adc_tm_iio ADC_GPIO1_PU2>;

	};



	camera-ftherm-adc {

	emmc-ufs-therm-adc {

		polling-delay-passive = <0>;

		polling-delay = <5000>;

		thermal-governor = "user_space";

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

+2 −2
Original line number Diff line number Diff line
@@ -2450,13 +2450,13 @@ 
			io-channels = <&pm6125_vadc ADC_GPIO1_PU2>,

					<&pm6125_vadc ADC_GPIO3_PU2>;



			emmc_ufs_therm {

			camera_flash_therm {

				reg = <ADC_GPIO1_PU2>;

				qcom,ratiometric;

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

			};



			camera_flash_therm {

			emmc_ufs_therm {

				reg = <ADC_GPIO3_PU2>;

				qcom,ratiometric;

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