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

Commit 46a8fcd4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: qti-virtual-sensor: Add virtual sensors for new core combination"

parents 943f420c 3d62c3fd

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

+28 −1
Original line number Diff line number Diff line
@@ -39,11 +39,12 @@ 
				<PON_POWER_OFF_SHUTDOWN>;

		};



		qcom,temp-alarm@2400 {

		pm660l_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			reg = <0x2400 0x100>;

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

			label = "pm660l_tz";

			#thermal-sensor-cells = <0>;

		};



		pm660l_gpios: pinctrl@c000 {
@@ -295,3 +296,29 @@ 
		};

	};

};



&thermal_zones {

	pm660l_tz {

		polling-delay-passive = <0>;

		polling-delay = <0>;

		thermal-sensors = <&pm660l_tz>;



		trips {

			pm660l_trip0: pm660l-trip0 {

				temperature = <105000>;

				hysteresis = <0>;

				type = "passive";

			};

			 pm660l_trip1: pm660l-trip1 {

				temperature = <125000>;

				hysteresis = <0>;

				type = "passive";

			};

			 pm660l_trip2: pm660l-trip2 {

				temperature = <145000>;

				hysteresis = <0>;

				type = "critical";

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm670-gpu.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 


		/* base addr, size */

		qcom,gpu-qdss-stm = <0x161c0000 0x40000>;

		#cooling-cells = <2>;



		clocks = <&clock_gfx GPU_CC_GX_GFX3D_CLK>,

			<&clock_gpucc GPU_CC_CXO_CLK>,

arch/arm64/boot/dts/qcom/sdm670-pmic-overlay.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
		compatible = "qcom,qpnp-smb2";

		#address-cells = <1>;

		#size-cells = <1>;

		#cooling-cells = <2>;



		qcom,pmic-revid = <&pm660_revid>;

arch/arm64/boot/dts/qcom/sdm670-regulator.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -96,6 +96,14 @@ 
			regulator-min-microvolt = <RPMH_REGULATOR_LEVEL_OFF>;

			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

		};



		mx_cdev: mx-cdev-lvl {

			compatible = "qcom,regulator-cooling-device";

			regulator-cdev-supply = <&pm660l_s1_level>;

			regulator-levels = <RPMH_REGULATOR_LEVEL_NOM

					RPMH_REGULATOR_LEVEL_OFF>;

			#cooling-cells = <2>;

		};

	};



	/* pm660l S2 - VDD_GFX supply */
@@ -137,6 +145,13 @@ 
			regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;

			qcom,min-dropout-voltage-level = <(-1)>;

		};



		cx_cdev: regulator-cdev {

			compatible = "qcom,rpmh-reg-cdev";

			mboxes = <&qmp_aop 0>;

			qcom,reg-resource-name = "cx";

			#cooling-cells = <2>;

		};

	};



	rpmh-regulator-ldoa1 {

arch/arm64/configs/sdm670-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -321,10 +321,12 @@ CONFIG_QCOM_SPMI_TEMP_ALARM=y 
CONFIG_THERMAL_QPNP=y

CONFIG_THERMAL_QPNP_ADC_TM=y

CONFIG_THERMAL_TSENS=y

CONFIG_MSM_BCL_PERIPHERAL_CTL=y

CONFIG_QTI_THERMAL_LIMITS_DCVS=y

CONFIG_QTI_VIRTUAL_SENSOR=y

CONFIG_QTI_AOP_REG_COOLING_DEVICE=y

CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y