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

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

Merge "ARM: dts: msm: Add ADC channel nodes for kona"

parents c39f1a51 acfc42fb

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+184 −0
Original line number Diff line number Diff line
@@ -60,3 +60,187 @@ 
		qca,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

	};

};



&pm8150b_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	chg_sbux@99 {

		reg = <ADC_SBUx>;

		label = "chg_sbux";

		qcom,pre-scaling = <1 3>;

	};



	mid_chg_div6@1e {

		reg = <ADC_MID_CHG_DIV6>;

		label = "chg_mid";

		qcom,pre-scaling = <1 6>;

	};



	usb_in_i_uv@7 {

		reg = <ADC_USB_IN_I>;

		label = "usb_in_i_uv";

		qcom,pre-scaling = <1 1>;

	};



	usb_in_v_div_16@8 {

		reg = <ADC_USB_IN_V_16>;

		label = "usb_in_v_div_16";

		qcom,pre-scaling = <1 16>;

	};

};



&pm8150_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	vcoin@85 {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "pa_therm1";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150l_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "skin_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm2";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150b_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

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

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150l_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};

};

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+184 −0
Original line number Diff line number Diff line
@@ -60,3 +60,187 @@ 
		qca,bt-vdd-rfa2-voltage-level = <1350000 1350000>;

	};

};



&pm8150b_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	chg_sbux@99 {

		reg = <ADC_SBUx>;

		label = "chg_sbux";

		qcom,pre-scaling = <1 3>;

	};



	mid_chg_div6@1e {

		reg = <ADC_MID_CHG_DIV6>;

		label = "chg_mid";

		qcom,pre-scaling = <1 6>;

	};



	usb_in_i_uv@7 {

		reg = <ADC_USB_IN_I>;

		label = "usb_in_i_uv";

		qcom,pre-scaling = <1 1>;

	};



	usb_in_v_div_16@8 {

		reg = <ADC_USB_IN_V_16>;

		label = "usb_in_v_div_16";

		qcom,pre-scaling = <1 16>;

	};

};



&pm8150_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	vcoin@85 {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "pa_therm1";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150l_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "skin_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm2";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150b_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

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

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150l_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};

};

arch/arm64/boot/dts/qcom/kona-qrd.dtsi

+184 −0
Original line number Diff line number Diff line
@@ -81,3 +81,187 @@ 


	status = "ok";

};



&pm8150b_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	chg_sbux@99 {

		reg = <ADC_SBUx>;

		label = "chg_sbux";

		qcom,pre-scaling = <1 3>;

	};



	mid_chg_div6@1e {

		reg = <ADC_MID_CHG_DIV6>;

		label = "chg_mid";

		qcom,pre-scaling = <1 6>;

	};



	usb_in_i_uv@7 {

		reg = <ADC_USB_IN_I>;

		label = "usb_in_i_uv";

		qcom,pre-scaling = <1 1>;

	};



	usb_in_v_div_16@8 {

		reg = <ADC_USB_IN_V_16>;

		label = "usb_in_v_div_16";

		qcom,pre-scaling = <1 16>;

	};

};



&pm8150_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	vcoin@85 {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "pa_therm1";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150l_vadc {

	#address-cells = <1>;

	#size-cells = <0>;



	vph_pwr@83 {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "skin_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm2";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm8150b_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	wp_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	xo_therm@4c {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

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

	};



	skin_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm1@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};

};



&pm8150l_adc_tm {

	#address-cells = <1>;

	#size-cells = <0>;



	camera_flash_therm@4d {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	skin_msm_therm@4e {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	pa_therm2@4f {

		reg = <ADC_AMUX_THM3_PU2>;

		qcom,ratiometric;

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

	};

};

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

+45 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>



&spmi_bus {

	#address-cells = <2>;
@@ -87,6 +88,50 @@ 
			compatible = "qcom,pm8941-rtc";

			interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

		};



		pm8150_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

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

			interrupt-names = "eoc-int-en-set";

			qcom,adc-vdd-reference = <1875>;

			#io-channel-cells = <1>;

			io-channel-ranges;



			/* Channel node */

			ref_gnd@0 {

				reg = <ADC_REF_GND>;

				label = "ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			vref_1p25@1 {

				reg = <ADC_1P25VREF>;

				label = "vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			die_temp@2 {

				reg = <ADC_DIE_TEMP>;

				label = "die_temp";

				qcom,pre-scaling = <1 1>;

			};

		};



		pm8150_adc_tm: adc_tm@3500 {

			compatible = "qcom,adc-tm5";

			reg = <0x3500 0x100>;

			interrupts = <0x0 0x35 0x0 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "thr-int-en";

			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150_vadc ADC_XO_THERM_PU2>,

					<&pm8150_vadc ADC_AMUX_THM1_PU2>,

					<&pm8150_vadc ADC_AMUX_THM2_PU2>;

		};

	};



	qcom,pm8150@1 {

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

+66 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/iio/qcom,spmi-vadc.h>



&spmi_bus {

	#address-cells = <2>;
@@ -332,6 +333,71 @@ 
						  "mem-attn";

			};

		};



		pm8150b_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100 0x100>, <0x3700 0x100>;

			reg-names = "adc5-usr-base", "adc5-cal-base";

			#address-cells = <1>;

			#size-cells = <0>;

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

			interrupt-names = "eoc-int-en-set";

			qcom,adc-vdd-reference = <1875>;

			#io-channel-cells = <1>;

			io-channel-ranges;



			/* Channel node */

			ref_gnd@0 {

				reg = <ADC_REF_GND>;

				label = "ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			vref_1p25@1 {

				reg = <ADC_1P25VREF>;

				label = "vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			die_temp@2 {

				reg = <ADC_DIE_TEMP>;

				label = "die_temp";

				qcom,pre-scaling = <1 1>;

			};



			chg_temp@9 {

				reg = <ADC_CHG_TEMP>;

				label = "chg_temp";

				qcom,pre-scaling = <1 1>;

			};



			smb1390_therm@e {

				reg = <ADC_AMUX_THM2>;

				label = "smb1390_therm";

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

				qcom,pre-scaling = <1 1>;

			};



			smb1355_therm@4e {

				reg = <ADC_AMUX_THM2_PU2>;

				label = "smb1355_therm";

				qcom,ratiometric;

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

				qcom,pre-scaling = <1 1>;

			};

		};



		pm8150b_adc_tm: adc_tm@3500 {

			compatible = "qcom,adc-tm5";

			reg = <0x3500 0x100>;

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

			interrupt-names = "thr-int-en";

			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

			io-channels = <&pm8150b_vadc ADC_AMUX_THM1_PU2>;

			qcom,pmic-revid = <&pm8150b_revid>;

		};

	};



	qcom,pm8150b@3 {