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

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

Merge "ARM: dts: msm: Add VADC and ADC_TM support for SM6150"

parents f42546f1 2d290a56

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

+127 −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,pm6150@0 {
@@ -52,6 +53,132 @@ 
			};

		};



		pm6150_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 nodes */

			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>;

			};



			vph_pwr {

				reg = <ADC_VPH_PWR>;

				label = "vph_pwr";

				qcom,pre-scaling = <1 3>;

			};



			vbat_sns {

				reg = <ADC_VBAT_SNS>;

				label = "vph_pwr";

				qcom,pre-scaling = <1 3>;

			};



			vcoin {

				reg = <ADC_VCOIN>;

				label = "vcoin";

				qcom,pre-scaling = <1 3>;

			};



			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>;

			};



			chg_temp {

				reg = <ADC_CHG_TEMP>;

				label = "chg_temp";

				qcom,ratiometric;

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

				qcom,pre-scaling = <1 1>;

			};



			bat_therm {

				reg = <ADC_BAT_THERM_PU2>;

				label = "bat_therm";

				qcom,ratiometric;

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

				qcom,pre-scaling = <1 1>;

			};



			bat_id {

				reg = <ADC_BAT_ID_PU2>;

				label = "bat_id";

				qcom,pre-scaling = <1 1>;

			};



			xo_therm {

				reg = <ADC_XO_THERM_PU2>;

				label = "xo_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>;

			};



			v_i_int_ext {

				reg = <ADC_INT_EXT_ISENSE_VBAT_VDATA>;

				label = "v_i_int_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>;

			};



		};



		pm6150_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>;

		};



		pm6150_misc: qcom,misc@900 {

			compatible = "qcom,qpnp-misc";

			reg = <0x900 0x100>;

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

+48 −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,pm6150l@4 {
@@ -51,6 +52,53 @@ 
			#thermal-sensor-cells = <1>;

		};



		pm6150l_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>;

			};



			vph_pwr {

				reg = <ADC_VPH_PWR>;

				label = "vph_pwr";

				qcom,pre-scaling = <1 3>;

			};

		};



		pm6150l_adc_tm: adc_tm@3500 {

			compatible = "qcom,adc-tm5";

			reg = <0x3500 0x100>;

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

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

			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

		};



		pm6150l_clkdiv: clock-controller@5b00 {

			compatible = "qcom,spmi-clkdiv";

			reg = <0x5b00 0x100>;

arch/arm64/boot/dts/qcom/sm6150-thermal.dtsi

+98 −0
Original line number Diff line number Diff line
@@ -1361,4 +1361,102 @@ 
			};

		};

	};



	xo-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150_adc_tm ADC_XO_THERM_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	sdm-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	conn-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150_adc_tm ADC_AMUX_THM4_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	emmc_ufs-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm ADC_AMUX_THM1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	rf_pa0_therm-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm ADC_AMUX_THM2_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera_flash-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm ADC_GPIO1_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	quiet-therm {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pm6150l_adc_tm ADC_GPIO4_PU2>;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};

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

+117 −0
Original line number Diff line number Diff line
@@ -2072,6 +2072,123 @@ 
	vbus_dwc3-supply = <&smb5_vbus>;

};



&pm6150_vadc {

	sdm_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "sdm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	conn_therm {

		reg = <ADC_AMUX_THM4_PU2>;

		label = "conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm6150_adc_tm {

	io-channels = <&pm6150_vadc ADC_XO_THERM_PU2>,

			<&pm6150_vadc ADC_AMUX_THM2_PU2>,

			<&pm6150_vadc ADC_AMUX_THM4_PU2>;



	/* Channel nodes */

	xo_therm {

		reg = <ADC_XO_THERM_PU2>;

		qcom,ratiometric;

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

	};



	sdm_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	conn_therm {

		reg = <ADC_AMUX_THM4_PU2>;

		qcom,ratiometric;

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

	};

};



&pm6150l_vadc {

	emmc_ufs_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		label = "emmc_ufs_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	rf_pa0_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		label = "rf_pa0_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	rf_pa1_therm {

		reg = <ADC_AMUX_THM3_PU2>;

		label = "rf_pa1_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	camera_flash_therm {

		reg = <ADC_GPIO1_PU2>;

		label = "camera_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	quiet_therm {

		reg = <ADC_GPIO4_PU2>;

		label = "quiet_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pm6150l_adc_tm {

	io-channels = <&pm6150l_vadc ADC_AMUX_THM1_PU2>,

			<&pm6150l_vadc ADC_AMUX_THM2_PU2>,

			<&pm6150l_vadc ADC_GPIO1_PU2>,

			<&pm6150l_vadc ADC_GPIO4_PU2>;



	/* Channel nodes */

	emmc_ufs_therm {

		reg = <ADC_AMUX_THM1_PU2>;

		qcom,ratiometric;

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

	};



	rf_pa0_therm {

		reg = <ADC_AMUX_THM2_PU2>;

		qcom,ratiometric;

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

	};



	camera_flash_therm {

		reg = <ADC_GPIO1_PU2>;

		qcom,ratiometric;

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

	};



	quiet_therm {

		reg = <ADC_GPIO4_PU2>;

		qcom,ratiometric;

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

	};

};



&emac_gdsc {

	status = "ok";

};