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

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

Merge "ARM: dts: msm: Remove low temperature monitor thermal zones for SA8155"

parents 6a96ef08 f4c681c6

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

+1 −23
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, 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
@@ -459,13 +459,6 @@ 
				= <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>;

		};

	};



	/* PM8150_2 S10 = VDD_MX supply */
@@ -497,14 +490,6 @@ 
			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>;

		};

	};



	rpmh-regulator-ldoc1 {
@@ -617,13 +602,6 @@ 
			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-ldoc12 {

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

+4 −20
Original line number Diff line number Diff line
@@ -221,26 +221,10 @@ 
};



&thermal_zones {

	cpu-1-7-lowf {

		cooling-maps {

			/delete-node/ mmcx_vdd_cdev;

		};

	};

	gpuss-0-lowf {

		cooling-maps {

			/delete-node/ mmcx_vdd_cdev;

		};

	};

	camera-lowf {

		cooling-maps {

			/delete-node/ mmcx_vdd_cdev;

		};

	};

	mdm-scl-lowf {

		cooling-maps {

			/delete-node/ mmcx_vdd_cdev;

		};

	};

	 /delete-node/ cpu-1-7-lowf;

	 /delete-node/ gpuss-0-lowf;

	 /delete-node/ camera-lowf;

	 /delete-node/ mdm-scl-lowf;



	lmh-dcvs-01 {

		trips {