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

Commit 72043e6e 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: Add VADC nodes for SDM855" into msm-4.14

parents d3cc31fd 3542dac5

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

+32 −0
Original line number Diff line number Diff line
@@ -15,6 +15,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 {

	qcom,pm855@0 {
@@ -102,6 +103,37 @@ 
			compatible = "qcom,spmi-sdam";

			reg = <0xb100 0x100>;

		};



		pm855_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 {

				reg = <ADC_REF_GND>;

				label = "ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			vref_1p25 {

				reg = <ADC_1P25VREF>;

				label = "vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			die_temp {

				reg = <ADC_DIE_TEMP>;

				label = "die_temp";

				qcom,pre-scaling = <1 1>;

			};

		};

	};



	qcom,pm855@1 {

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

+56 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


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

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

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



&spmi_bus {

	qcom,pm855b@2 {
@@ -71,6 +72,61 @@ 
			qcom,gpios-disallowed = <3 4 7>;

		};



		pm855b_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100 0x100>;

			#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 {

				reg = <ADC_REF_GND>;

				label = "ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			vref_1p25 {

				reg = <ADC_1P25VREF>;

				label = "vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			die_temp {

				reg = <ADC_DIE_TEMP>;

				label = "die_temp";

				qcom,pre-scaling = <1 1>;

			};



			chg_temp {

				reg = <ADC_CHG_TEMP>;

				label = "chg_temp";

				qcom,pre-scaling = <1 1>;

			};



			v_i_int_ext {

				reg = <ADC_INT_EXT_ISENSE_VBAT_VDATA>;

				label = "v_i_int_vbat_vdata";

				qcom,pre-scaling = <1 1>;

			};



			v_i_ext {

				reg = <ADC_EXT_ISENSE_VBAT_VDATA>;

				label = "v_i_int_ext_vbat_vdata";

				qcom,pre-scaling = <1 1>;

			};



			v_i_parallel {

				reg = <ADC_PARALLEL_ISENSE_VBAT_VDATA>;

				label = "v_i_parallel_vbat_vdata";

				qcom,pre-scaling = <1 1>;

			};

		};



		pm855b_charger: qcom,qpnp-smb5 {

			compatible = "qcom,qpnp-smb5";

			#address-cells = <1>;

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

+32 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


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

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

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



&spmi_bus {

	qcom,pm855l@4 {
@@ -73,6 +74,37 @@ 
			#gpio-cells = <2>;

			qcom,gpios-disallowed = <7>;

		};



		pm855l_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc5";

			reg = <0x3100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0x4 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 {

				reg = <ADC_REF_GND>;

				label = "ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			vref_1p25 {

				reg = <ADC_1P25VREF>;

				label = "vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			die_temp {

				reg = <ADC_DIE_TEMP>;

				label = "die_temp";

				qcom,pre-scaling = <1 1>;

			};

		};

	};



	qcom,pm855l@5 {

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

+132 −0
Original line number Diff line number Diff line
@@ -226,3 +226,135 @@ 
&pm855b_charger {

	qcom,batteryless-platform;

};



&pm855b_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	wp_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	smb_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "smb_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	conn_therm {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	chg_sbux {

		reg = <ADC_SBUx>;

		label = "chg_sbux";

		qcom,pre-scaling = <1 3>;

	};



	mid_chg_div6 {

		reg = <ADC_MID_CHG_DIV6>;

		label = "chg_mid";

		qcom,pre-scaling = <1 6>;

	};



	usb_in_i_uv {

		reg = <ADC_USB_IN_I>;

		label = "usb_in_i_uv";

		qcom,pre-scaling = <1 1>;

	};



	usb_in_v_div_16 {

		reg = <ADC_USB_IN_V_16>;

		label = "usb_in_v_div_16";

		qcom,pre-scaling = <1 16>;

	};

};



&pm855_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	xo_therm {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm1 {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "pa_therm1";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm855l_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	camera_flash_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_msm_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "skin_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm2 {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm2";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};

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

+132 −0
Original line number Diff line number Diff line
@@ -221,3 +221,135 @@ 


	status = "ok";

};



&pm855b_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	wp_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "wp_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	smb_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "smb_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	conn_therm {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	chg_sbux {

		reg = <ADC_SBUx>;

		label = "chg_sbux";

		qcom,pre-scaling = <1 3>;

	};



	mid_chg_div6 {

		reg = <ADC_MID_CHG_DIV6>;

		label = "chg_mid";

		qcom,pre-scaling = <1 6>;

	};



	usb_in_i_uv {

		reg = <ADC_USB_IN_I>;

		label = "usb_in_i_uv";

		qcom,pre-scaling = <1 1>;

	};



	usb_in_v_div_16 {

		reg = <ADC_USB_IN_V_16>;

		label = "usb_in_v_div_16";

		qcom,pre-scaling = <1 16>;

	};

};



&pm855_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	vcoin {

		reg = <ADC_VCOIN>;

		label = "vcoin";

		qcom,pre-scaling = <1 3>;

	};



	xo_therm {

		reg = <ADC_XO_THERM_PU2>;

		label = "xo_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "skin_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm1 {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "pa_therm1";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm855l_vadc {

	vph_pwr {

		reg = <ADC_VPH_PWR>;

		label = "vph_pwr";

		qcom,pre-scaling = <1 3>;

	};



	camera_flash_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	skin_msm_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "skin_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pa_therm2 {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "pa_therm2";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};