Commit 41c18552 authored by Marijn Suijten's avatar Marijn Suijten Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: Use labels with generic node names for ADC channels 

As discussed in [1] it is more convenient to use a generic `channel`
node name for ADC channels while storing a friendly - board-specific
instead of PMIC-specific - name in the label, if/when desired to
overwrite the channel description already contained (but previously
unused) in the driver [2].  Follow up on the dt-bindings' `channel` node
name requirement, and instead provide this (sometimes per-board) channel
description through a label property.

Also remove all the unused label references (not to be confused with
label properties) from pm660, pmp8074 and pms405.

[1]: https://lore.kernel.org/linux-arm-msm/20221106193018.270106-1-marijn.suijten@somainline.org/T/#u
[2]: https://lore.kernel.org/linux-arm-msm/20230116220909.196926-4-marijn.suijten@somainline.org/



Acked-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230730-generic-adc-channels-v5-2-e6c69bda8034@somainline.org


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

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

+12 −6
Original line number Diff line number Diff line
@@ -85,36 +85,42 @@ pm6125_adc: adc@3100 { 
			interrupts = <0x0 0x31 0x0 IRQ_TYPE_EDGE_RISING>;

			#io-channel-cells = <1>;



			ref-gnd@0 {

			channel@0 {

				reg = <ADC5_REF_GND>;

				qcom,pre-scaling = <1 1>;

				label = "ref_gnd";

			};



			vref-1p25@1 {

			channel@1 {

				reg = <ADC5_1P25VREF>;

				qcom,pre-scaling = <1 1>;

				label = "vref_1p25";

			};



			die-temp@6 {

			channel@6 {

				reg = <ADC5_DIE_TEMP>;

				qcom,pre-scaling = <1 1>;

				label = "die_temp";

			};



			vph-pwr@83 {

			channel@83 {

				reg = <ADC5_VPH_PWR>;

				qcom,pre-scaling = <1 3>;

				label = "vph_pwr";

			};



			vcoin@85 {

			channel@85 {

				reg = <ADC5_VCOIN>;

				qcom,pre-scaling = <1 3>;

				label = "vcoin";

			};



			xo-therm@4c {

			channel@4c {

				reg = <ADC5_XO_THERM_100K_PU>;

				qcom,pre-scaling = <1 1>;

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

				qcom,ratiometric;

				label = "xo_therm";

			};

		};

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ pm6150_adc: adc@3100 { 
			#size-cells = <0>;

			#io-channel-cells = <1>;



			adc-chan@6 {

			channel@6 {

				reg = <ADC5_DIE_TEMP>;

				label = "die_temp";

			};

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

+4 −4
Original line number Diff line number Diff line
@@ -60,25 +60,25 @@ pm6150l_adc: adc@3100 { 
			#size-cells = <0>;

			#io-channel-cells = <1>;



			adc-chan@0 {

			channel@0 {

				reg = <ADC5_REF_GND>;

				qcom,pre-scaling = <1 1>;

				label = "ref_gnd";

			};



			adc-chan@1 {

			channel@1 {

				reg = <ADC5_1P25VREF>;

				qcom,pre-scaling = <1 1>;

				label = "vref_1p25";

			};



			adc-chan@6 {

			channel@6 {

				reg = <ADC5_DIE_TEMP>;

				qcom,pre-scaling = <1 1>;

				label = "die_temp";

			};



			adc-chan@83 {

			channel@83 {

				reg = <ADC5_VPH_PWR>;

				qcom,pre-scaling = <1 3>;

				label = "vph_pwr";

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

+22 −11
Original line number Diff line number Diff line
@@ -91,82 +91,93 @@ pm660_adc: adc@3100 { 
			#size-cells = <0>;

			#io-channel-cells = <1>;



			ref_gnd: ref_gnd@0 {

			channel@0 {

				reg = <ADC5_REF_GND>;

				qcom,decimation = <1024>;

				qcom,pre-scaling = <1 1>;

				label = "ref_gnd";

			};



			vref_1p25: vref_1p25@1 {

			channel@1 {

				reg = <ADC5_1P25VREF>;

				qcom,decimation = <1024>;

				qcom,pre-scaling = <1 1>;

				label = "vref_1p25";

			};



			die_temp: die_temp@6 {

			channel@6 {

				reg = <ADC5_DIE_TEMP>;

				qcom,decimation = <1024>;

				qcom,pre-scaling = <1 1>;

				label = "die_temp";

			};



			xo_therm: xo_therm@4c {

			channel@4c {

				reg = <ADC5_XO_THERM_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "xo_therm";

			};



			msm_therm: msm_therm@4d {

			channel@4d {

				reg = <ADC5_AMUX_THM1_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "msm_therm";

			};



			emmc_therm: emmc_therm@4e {

			channel@4e {

				reg = <ADC5_AMUX_THM2_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "emmc_therm";

			};



			pa_therm0: thermistor0@4f {

			channel@4f {

				reg = <ADC5_AMUX_THM3_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "pa_therm0";

			};



			pa_therm1: thermistor1@50 {

			channel@50 {

				reg = <ADC5_AMUX_THM4_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "pa_therm1";

			};



			quiet_therm: quiet_therm@51 {

			channel@51 {

				reg = <ADC5_AMUX_THM5_100K_PU>;

				qcom,pre-scaling = <1 1>;

				qcom,decimation = <1024>;

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

				qcom,ratiometric;

				label = "quiet_therm";

			};



			vadc_vph_pwr: vph_pwr@83 {

			channel@83 {

				reg = <ADC5_VPH_PWR>;

				qcom,decimation = <1024>;

				qcom,pre-scaling = <1 3>;

				label = "vph_pwr";

			};



			vcoin: vcoin@85 {

			channel@85 {

				reg = <ADC5_VCOIN>;

				qcom,decimation = <1024>;

				qcom,pre-scaling = <1 3>;

				label = "vcoin";

			};

		};

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

+12 −12
Original line number Diff line number Diff line
@@ -62,56 +62,56 @@ pm7250b_adc: adc@3100 { 
			#io-channel-cells = <1>;

			interrupts = <0x2 0x31 0x0 IRQ_TYPE_EDGE_RISING>;



			adc-chan@0 {

			channel@0 {

				reg = <ADC5_REF_GND>;

				qcom,pre-scaling = <1 1>;

				label = "ref_gnd";

			};



			adc-chan@1 {

			channel@1 {

				reg = <ADC5_1P25VREF>;

				qcom,pre-scaling = <1 1>;

				label = "vref_1p25";

			};



			adc-chan@2 {

			channel@2 {

				reg = <ADC5_DIE_TEMP>;

				qcom,pre-scaling = <1 1>;

				label = "die_temp";

			};



			adc-chan@7 {

			channel@7 {

				reg = <ADC5_USB_IN_I>;

				qcom,pre-scaling = <1 1>;

				label = "usb_in_i_uv";

			};



			adc-chan@8 {

			channel@8 {

				reg = <ADC5_USB_IN_V_16>;

				qcom,pre-scaling = <1 16>;

				label = "usb_in_v_div_16";

			};



			adc-chan@9 {

			channel@9 {

				reg = <ADC5_CHG_TEMP>;

				qcom,pre-scaling = <1 1>;

				label = "chg_temp";

			};



			adc-chan@e {

			channel@e {

				reg = <ADC5_AMUX_THM2>;

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

				qcom,pre-scaling = <1 1>;

				label = "smb1390_therm";

			};



			adc-chan@1e {

			channel@1e {

				reg = <ADC5_MID_CHG_DIV6>;

				qcom,pre-scaling = <1 6>;

				label = "chg_mid";

			};



			adc-chan@4b {

			channel@4b {

				reg = <ADC5_BAT_ID_100K_PU>;

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

				qcom,pre-scaling = <1 1>;
@@ -119,19 +119,19 @@ adc-chan@4b { 
				label = "bat_id";

			};



			adc-chan@83 {

			channel@83 {

				reg = <ADC5_VPH_PWR>;

				qcom,pre-scaling = <1 3>;

				label = "vph_pwr";

			};



			adc-chan@84 {

			channel@84 {

				reg = <ADC5_VBAT_SNS>;

				qcom,pre-scaling = <1 3>;

				label = "vbat_sns";

			};



			adc-chan@99 {

			channel@99 {

				reg = <ADC5_SBUx>;

				qcom,pre-scaling = <1 3>;

				label = "chg_sbux";