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

Commit 2860e197 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update VADC channels decimation on mdmcalifornium"

parents 45f39505 c007e927

arch/arm/boot/dts/qcom/mdmcalifornium-cdp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;
@@ -101,7 +101,7 @@ 
	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;
@@ -113,7 +113,7 @@ 
	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -125,7 +125,7 @@ 
	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -137,7 +137,7 @@ 
	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -149,7 +149,7 @@ 
	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

arch/arm/boot/dts/qcom/mdmcalifornium-mtp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;
@@ -126,7 +126,7 @@ 
	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;
@@ -138,7 +138,7 @@ 
	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -150,7 +150,7 @@ 
	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -162,7 +162,7 @@ 
	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -174,7 +174,7 @@ 
	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-cdp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;
@@ -101,7 +101,7 @@ 
	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;
@@ -113,7 +113,7 @@ 
	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -125,7 +125,7 @@ 
	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -137,7 +137,7 @@ 
	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -149,7 +149,7 @@ 
	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

arch/arm/boot/dts/qcom/mdmcalifornium-v1.1-mtp.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;
@@ -123,7 +123,7 @@ 
	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;
@@ -135,7 +135,7 @@ 
	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -147,7 +147,7 @@ 
	chan@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -159,7 +159,7 @@ 
	chan@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;
@@ -171,7 +171,7 @@ 
	chan@4f {

		label = "pa_therm2";

		reg = <0x4f>;

		qcom,decimation = <0>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <2>;

arch/arm/boot/dts/qcom/msm-pmdcalifornium.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
			chan@6 {

				label = "die_temp";

				reg = <6>;

				qcom,decimation = <0>;

				qcom,decimation = <2>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <3>;
@@ -141,7 +141,7 @@ 
			chan@0 {

				label = "ref_gnd";

				reg = <0>;

				qcom,decimation = <0>;

				qcom,decimation = <2>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;
@@ -153,7 +153,7 @@ 
			chan@1 {

				label = "ref_1250v";

				reg = <1>;

				qcom,decimation = <0>;

				qcom,decimation = <2>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "absolute";

				qcom,scale-function = <0>;