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

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

Merge "ARM: dts: msm: Add ADC support for Lahaina"

parents a0c3cabf b4f9dfcc

qcom/lahaina-pmic-overlay.dtsi

+251 −0
Original line number Diff line number Diff line
@@ -248,6 +248,257 @@ 
	};

};



&pm8350_gpios {

	pm8350_rear_tof_therm {

		pm8350_rear_tof_therm_default: pm8350_rear_tof_therm_default {

			pins = "gpio1";

			bias-high-impedance;

		};

	};

};



&pmk8350_vadc {

	pinctrl-names = "default";

	pinctrl-0 = <&pm8350_rear_tof_therm_default>;



	pm8350_msm_therm {

		reg = <PM8350_ADC7_AMUX_THM1_100K_PU>;

		label = "pm8350_msm_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350_cam_flash_therm {

		reg = <PM8350_ADC7_AMUX_THM2_100K_PU>;

		label = "pm8350_cam_flash_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350_hot_pocket_therm {

		reg = <PM8350_ADC7_AMUX_THM3_100K_PU>;

		label = "pm8350_hot_pocket_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350_wide_rfc_therm {

		reg = <PM8350_ADC7_AMUX_THM4_100K_PU>;

		label = "pm8350_wide_rfc_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350_rear_tof_therm {

		reg = <PM8350_ADC7_AMUX_THM5_100K_PU>;

		label = "pm8350_rear_tof_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350b_usb_conn_therm {

		reg = <PM8350B_ADC7_AMUX_THM4_100K_PU>;

		label = "pm8350b_usb_conn_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};



	pm8350b_wl_chg_therm {

		reg = <PM8350B_ADC7_GPIO2_100K_PU>;

		label = "pm8350b_wl_chg_therm";

		qcom,ratiometric;

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

		qcom,pre-scaling = <1 1>;

	};

};



&pmk8350_adc_tm {

	io-channels = <&pmk8350_vadc PM8350_ADC7_AMUX_THM1_100K_PU>,

			<&pmk8350_vadc PM8350_ADC7_AMUX_THM2_100K_PU>,

			<&pmk8350_vadc PM8350_ADC7_AMUX_THM3_100K_PU>,

			<&pmk8350_vadc PM8350_ADC7_AMUX_THM4_100K_PU>,

			<&pmk8350_vadc PM8350_ADC7_AMUX_THM5_100K_PU>,

			<&pmk8350_vadc PM8350B_ADC7_AMUX_THM4_100K_PU>,

			<&pmk8350_vadc PM8350B_ADC7_GPIO2_100K_PU>,

			<&pmk8350_vadc PMK8350_ADC7_AMUX_THM1_100K_PU>;



	pm8350_msm_therm {

		reg = <PM8350_ADC7_AMUX_THM1_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350_cam_flash_therm {

		reg = <PM8350_ADC7_AMUX_THM2_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350_hot_pocket_therm {

		reg = <PM8350_ADC7_AMUX_THM3_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350_wide_rfc_therm {

		reg = <PM8350_ADC7_AMUX_THM4_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350_rear_tof_therm {

		reg = <PM8350_ADC7_AMUX_THM5_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350b_usb_conn_therm {

		reg = <PM8350B_ADC7_AMUX_THM4_100K_PU>;

		qcom,ratiometric;

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

	};



	pm8350b_wl_chg_therm {

		reg = <PM8350B_ADC7_GPIO2_100K_PU>;

		qcom,ratiometric;

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

	};



	pmk8350_xo_therm {

		reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;

		qcom,ratiometric;

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

	};

};



&thermal_zones {

	skin-msm-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM1_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	camera-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM2_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	hot-pock-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM3_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	rear-cam-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM4_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	tof-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350_ADC7_AMUX_THM5_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	conn-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350B_ADC7_AMUX_THM4_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	wlc-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PM8350B_ADC7_GPIO2_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};



	xo-therm-usr {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-governor = "user_space";

		thermal-sensors = <&pmk8350_adc_tm PMK8350_ADC7_AMUX_THM1_100K_PU>;

		wake-capable-sensor;

		trips {

			active-config0 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

};



&restart {

	nvmem-cells = <&restart_reason>;

	nvmem-cell-names = "restart_reason";

qcom/pmk8350.dtsi

+148 −1
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 
#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-adc7-pm8350b.h>

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

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

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

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



&spmi_bus {

	#address-cells = <2>;
@@ -9,7 +14,7 @@ 
	interrupt-controller;

	#interrupt-cells = <4>;



	qcom,pmk8350@0 {

	pmk8350: qcom,pmk8350@0 {

		compatible = "qcom,spmi-pmic";

		reg = <0 SPMI_USID>;

		#address-cells = <1>;
@@ -40,6 +45,148 @@ 
			};

		};



		pmk8350_vadc: vadc@3100 {

			compatible = "qcom,spmi-adc7";

			reg = <0x3100>;

			#address-cells = <1>;

			#size-cells = <0>;

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

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

			#io-channel-cells = <1>;

			io-channel-ranges;



			/* PMK8350 Channel nodes */

			pmk8350_ref_gnd {

				reg = <PMK8350_ADC7_REF_GND>;

				label = "pmk8350_ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			pmk8350_vref_1p25 {

				reg = <PMK8350_ADC7_1P25VREF>;

				label = "pmk8350_vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			pmk8350_die_temp {

				reg = <PMK8350_ADC7_DIE_TEMP>;

				label = "pmk8350_die_temp";

				qcom,pre-scaling = <1 1>;

			};



			pmk8350_xo_therm {

				reg = <PMK8350_ADC7_AMUX_THM1_100K_PU>;

				label = "pmk8350_xo_therm";

				qcom,ratiometric;

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

				qcom,pre-scaling = <1 1>;

			};



			/* PM8350 Channel nodes */

			pm8350_ref_gnd {

				reg = <PM8350_ADC7_REF_GND>;

				label = "pm8350_ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			pm8350_vref_1p25 {

				reg = <PM8350_ADC7_1P25VREF>;

				label = "pm8350_vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			pm8350_die_temp {

				reg = <PM8350_ADC7_DIE_TEMP>;

				label = "pm8350_die_temp";

				qcom,pre-scaling = <1 1>;

			};



			pm8350_vph_pwr {

				reg = <PM8350_ADC7_VPH_PWR>;

				label = "pm8350_vph_pwr";

				qcom,pre-scaling = <1 3>;

			};



			/* PM8350b Channel nodes */

			pm8350b_ref_gnd {

				reg = <PM8350B_ADC7_REF_GND>;

				label = "pm8350b_ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			pm8350b_vref_1p25 {

				reg = <PM8350B_ADC7_1P25VREF>;

				label = "pm8350b_vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			pm8350b_die_temp {

				reg = <PM8350B_ADC7_DIE_TEMP>;

				label = "pm8350b_die_temp";

				qcom,pre-scaling = <1 1>;

			};



			pm8350b_vph_pwr {

				reg = <PM8350B_ADC7_VPH_PWR>;

				label = "pm8350b_vph_pwr";

				qcom,pre-scaling = <1 3>;

			};



			pm8350b_vbat_sns {

				reg = <PM8350B_ADC7_VBAT_SNS>;

				label = "pm8350b_vbat_sns";

				qcom,pre-scaling = <1 3>;

			};



			/* PMR735a Channel nodes */

			pmr735a_ref_gnd {

				reg = <PMR735A_ADC7_REF_GND>;

				label = "pmr735a_ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			pmr735a_vref_1p25 {

				reg = <PMR735A_ADC7_1P25VREF>;

				label = "pmr735a_vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			pmr735a_die_temp {

				reg = <PMR735A_ADC7_DIE_TEMP>;

				label = "pmr735a_die_temp";

				qcom,pre-scaling = <1 1>;

			};



			/* PMR735b Channel nodes */

			pmr735b_ref_gnd {

				reg = <PMR735B_ADC7_REF_GND>;

				label = "pmr735b_ref_gnd";

				qcom,pre-scaling = <1 1>;

			};



			pmr735b_vref_1p25 {

				reg = <PMR735B_ADC7_1P25VREF>;

				label = "pmr735b_vref_1p25";

				qcom,pre-scaling = <1 1>;

			};



			pmr735b_die_temp {

				reg = <PMR735B_ADC7_DIE_TEMP>;

				label = "pmr735b_die_temp";

				qcom,pre-scaling = <1 1>;

			};

		};



		pmk8350_adc_tm: adc_tm@3400 {

			compatible = "qcom,adc-tm7";

			reg = <0x3400>;

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

			interrupt-names = "threshold";

			#address-cells = <1>;

			#size-cells = <0>;

			#thermal-sensor-cells = <1>;

		};



		pmk8350_sdam_2: sdam@7100 {

			compatible = "qcom,spmi-sdam";

			reg = <0x7100>;