Merge "ARM: dts: msm: Add regulator cooling device for SDMSHRIKE" (66d3903b) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sdmshrike-regulators.dtsi

+42 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -306,6 +306,12 @@
		= <RPMH_REGULATOR_LEVEL_RETENTION>;
		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-smpe4 {
		@@ -575,6 +581,26 @@
		qcom,init-voltage-level
		= <RPMH_REGULATOR_LEVEL_LOW_SVS>;
		};

		VDD_MMCX_LEVEL_AO: S1C_LEVEL_AO:
		pm8150c_s1_level_ao: regulator-pm8150c-s1-level-ao {
		regulator-name = "pm8150c_s1_level_ao";
		qcom,set = <RPMH_REGULATOR_SET_ACTIVE>;
		regulator-min-microvolt
		= <RPMH_REGULATOR_LEVEL_LOW_SVS>;
		regulator-max-microvolt
		= <RPMH_REGULATOR_LEVEL_MAX>;
		qcom,init-voltage-level
		= <RPMH_REGULATOR_LEVEL_LOW_SVS>;
		};

		mm_cx_cdev: mm-cx-cdev-lvl {
		compatible = "qcom,regulator-cooling-device";
		regulator-cdev-supply = <&VDD_MMCX_LEVEL_AO>;
		regulator-levels = <RPMH_REGULATOR_LEVEL_NOM
		RPMH_REGULATOR_LEVEL_OFF>;
		#cooling-cells = <2>;
		};
		};

		/* PM8150C S2 = VDD_MODEM supply */
		@@ -623,6 +649,14 @@
		qcom,init-voltage-level
		= <RPMH_REGULATOR_LEVEL_RETENTION>;
		};

		mx_cdev: mx-cdev-lvl {
		compatible = "qcom,regulator-cooling-device";
		regulator-cdev-supply = <&VDD_MX_LEVEL>;
		regulator-levels = <RPMH_REGULATOR_LEVEL_NOM
		RPMH_REGULATOR_LEVEL_OFF>;
		#cooling-cells = <2>;
		};
		};

		/* PM8150C S5 = VDDA_EBI supply */
		@@ -640,6 +674,13 @@
		qcom,init-voltage-level
		= <RPMH_REGULATOR_LEVEL_RETENTION>;
		};

		ebi_cdev: regulator-cdev {
		compatible = "qcom,rpmh-reg-cdev";
		mboxes = <&qmp_aop 0>;
		qcom,reg-resource-name = "ebi";
		#cooling-cells = <2>;
		};
		};

		rpmh-regulator-smpc6 {

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

0 → 100644

+709 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

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

		&clock_cpucc {
		#address-cells = <1>;
		#size-cells = <1>;
		lmh_dcvs0: qcom,limits-dcvs@18358800 {
		compatible = "qcom,msm-hw-limits";
		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
		qcom,affinity = <0>;
		reg = <0x18358800 0x1000>,
		<0x18323000 0x1000>;
		#thermal-sensor-cells = <0>;
		};

		lmh_dcvs1: qcom,limits-dcvs@18350800 {
		compatible = "qcom,msm-hw-limits";
		interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
		qcom,affinity = <1>;
		reg = <0x18350800 0x1000>,
		<0x18325800 0x1000>;
		#thermal-sensor-cells = <0>;
		};
		};

		&thermal_zones {
		aoss0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens0 0>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-0-0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens0 1>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-0-1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens0 2>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-0-2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens0 3>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-0-3-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 4>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpuss-0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 5>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpuss-1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 6>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 7>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 8>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 9>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-3-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 10>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-4-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 11>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-5-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 12>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-6-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 13>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cpu-1-7-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 14>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		gpuss-0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens0 15>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		aoss-1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 0>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cwlan-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 1>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		video-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 2>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		ddr-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 3>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		q6-hvx-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 4>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		camera-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 5>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		cmpss-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 6>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		mdm-core-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 7>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		npu-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 8>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		mdm-vec-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 9>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		mdm-scl-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-sensors = <&tsens1 10>;
		thermal-governor = "user_space";
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		gpuss-1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens1 11>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		gpuss-2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens1 12>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		gpuss-3-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens1 13>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		ddrss-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens1 14>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		pcie-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&tsens1 15>;
		wake-capable-sensor;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		reset-mon-cfg {
		temperature = <115000>;
		hysteresis = <5000>;
		type = "passive";
		};
		};
		};

		lmh-dcvs-01 {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&lmh_dcvs1>;
		wake-capable-sensor;

		trips {
		active-config {
		temperature = <85000>;
		hysteresis = <25000>;
		type = "passive";
		};
		};
		};

		lmh-dcvs-00 {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&lmh_dcvs0>;
		wake-capable-sensor;

		trips {
		active-config {
		temperature = <85000>;
		hysteresis = <25000>;
		type = "passive";
		};
		};
		};
		};

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		enable-method = "psci";
		cache-size = <0x8000>;
		next-level-cache = <&L2_0>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		L2_0: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x20000>;
		@@ -86,6 +87,7 @@
		enable-method = "psci";
		cache-size = <0x8000>;
		next-level-cache = <&L2_1>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		L2_1: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x20000>;
		@@ -111,6 +113,7 @@
		enable-method = "psci";
		cache-size = <0x8000>;
		next-level-cache = <&L2_2>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		L2_2: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x20000>;
		@@ -136,6 +139,7 @@
		enable-method = "psci";
		cache-size = <0x8000>;
		next-level-cache = <&L2_3>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		L2_3: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x20000>;
		@@ -161,6 +165,7 @@
		enable-method = "psci";
		cache-size = <0x20000>;
		next-level-cache = <&L2_4>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		L2_4: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x80000>;
		@@ -186,6 +191,7 @@
		enable-method = "psci";
		cache-size = <0x20000>;
		next-level-cache = <&L2_5>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		L2_5: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x80000>;
		@@ -211,6 +217,7 @@
		enable-method = "psci";
		cache-size = <0x20000>;
		next-level-cache = <&L2_6>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		L2_6: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x80000>;
		@@ -236,6 +243,7 @@
		enable-method = "psci";
		cache-size = <0x20000>;
		next-level-cache = <&L2_7>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		L2_7: l2-cache {
		compatible = "arm,arch-cache";
		cache-size = <0x80000>;
		@@ -2156,3 +2164,4 @@
		#include "sm8150-audio.dtsi"
		#include "sm8150-pm.dtsi"
		#include "sdmshrike-gpu.dtsi"
		#include "sdmshrike-thermal.dtsi"

drivers/thermal/qcom/qti_virtual_sensor.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,15 @@ static const struct virtual_sensor_data qti_virtual_sensors[] = {
		"cpuss-2-usr"},
		.logic = VIRT_MAXIMUM,
		},
		{
		.virt_zone_name = "quad-gpuss-max-step",
		.num_sensors = 4,
		.sensor_names = {"gpuss-0-usr",
		"gpuss-1-usr",
		"gpuss-2-usr",
		"gpuss-3-usr"},
		.logic = VIRT_MAXIMUM,
		},
		};

		int qti_virtual_sensor_register(struct device *dev)