Commit a36a566b authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sc8280xp-pmics: Define adc for temp-alarms 



sc8280xp-pmics define the two thermal zones "pm8280-1-thermal" and
"pm8280-2-thermal", but the related temp-alarm instances are not tied to
any adc channels, and as such continuously report the bogus temperature
of 37C.

After previously defining these adc channels across all boards using
sc8280xp-pmics.dtsi, we can now add these references.

This does however mean that we have a non-disabled node referencing
default-disabled nodes, requiring each board to enable the pmk8280_vadc.
Avoid this by marking pmk8280_vadc okay.

Signed-off-by: default avatarBjorn Andersson <quic_bjorande@quicinc.com>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20240210-sc8280xp-pmic-thermal-v1-2-a1c215a17d10@quicinc.com


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 6cca740c

arch/arm64/boot/dts/qcom/sc8280xp-crd.dts

+0 −4
Original line number Diff line number Diff line
@@ -604,10 +604,6 @@ rtc_offset: rtc-offset@bc { 
	};

};



&pmk8280_vadc {

	status = "okay";

};



&qup0 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts

+0 −2
Original line number Diff line number Diff line
@@ -851,8 +851,6 @@ rtc_offset: rtc-offset@bc { 
};



&pmk8280_vadc {

	status = "okay";



	channel@144 {

		reg = <PM8350_ADC7_AMUX_THM1_100K_PU(1)>;

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

arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ pmk8280_vadc: adc@3100 { 
			#address-cells = <1>;

			#size-cells = <0>;

			#io-channel-cells = <1>;

			status = "disabled";



			channel@3 {

				reg = <PMK8350_ADC7_DIE_TEMP>;
@@ -160,6 +159,8 @@ pm8280_1_temp_alarm: temp-alarm@a00 { 
			compatible = "qcom,spmi-temp-alarm";

			reg = <0xa00>;

			interrupts-extended = <&spmi_bus 0x1 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;

			io-channels = <&pmk8280_vadc PM8350_ADC7_DIE_TEMP(1)>;

			io-channel-names = "thermal";

			#thermal-sensor-cells = <0>;

		};
@@ -212,6 +213,8 @@ pm8280_2_temp_alarm: temp-alarm@a00 { 
			compatible = "qcom,spmi-temp-alarm";

			reg = <0xa00>;

			interrupts-extended = <&spmi_bus 0x2 0xa 0x0 IRQ_TYPE_EDGE_BOTH>;

			io-channels = <&pmk8280_vadc PM8350_ADC7_DIE_TEMP(3)>;

			io-channel-names = "thermal";

			#thermal-sensor-cells = <0>;

		};