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

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

Merge "ARM: dts: msm: free up SDPM 4 in lahaina"

parents 05201326 d92e38bf

bindings/thermal/qti-cpu-hotplug-cdev.txt

0 → 100644
+50 −0
Original line number Diff line number Diff line 
QTI CPU hotplug cooling devices.



The CPU hotplug cooling device will be used for hotpluging a CPU on a thermal

condition. This cooling device driver can register one cooling device per CPU,

which can be used by thermal zone to mitigate.



Each child node will represent a cooling device and the child node should

point to the CPU, which will be mitigated by that cooling device instance.



Properties:

- compatible:

	Usage: required

	Value type: <string>

	Definition: should be "qcom,cpu-hotplug"



Cooling device node:

- qcom,cpu:

	Usage: required

	Value type: <phandle>

	Definition: phandle to the CPU device that this cooling device will

			mitigate.



-#cooling-cells:

	Usage: required

	Value type: <integer>

	Definition: Must be 2. Needed for of_thermal as cooling device

			identifier. Please refer to

			<devicetree/bindings/thermal/thermal.txt> for more

			details.

Example:

	qcom,cpu-hotplug {

		compatible = "qcom,cpu-hotplug";



		cpu0_hotplug: cpu0-hotplug {

			qcom,cpu = <&CPU0>;

			#cooling-cells = <2>;

		};

		cpu1_hotplug: cpu1-hotplug {

			qcom,cpu = <&CPU1>;

			#cooling-cells = <2>;

		};

		cpu2_hotplug: cpu2-hotplug {

			qcom,cpu = <&CPU2>;

			#cooling-cells = <2>;

		};

		cpu3_hotplug: cpu3-hotplug {

			qcom,cpu = <&CPU3>;

			#cooling-cells = <2>;

		};

        };

qcom/lahaina-pmic-overlay.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -494,6 +494,12 @@ 
				hysteresis = <1000>;

				type = "passive";

			};



			active-config1 {

				temperature = <125000>;

				hysteresis = <1000>;

				type = "passive";

			};

		};

	};

qcom/lahaina-thermal.dtsi

+44 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
		clocks = <&clock_camcc CAM_CC_CSI0PHYTIMER_CLK_SRC>,

			<&clock_gcc GCC_UFS_PHY_AXI_CLK_SRC>;

		cam_cc_csi0phytiimer-supply = <&cam_cc_ipe_0_gdsc>;

		cpu = <&CPU7>;

		csr-id = <5 7 4>;

		csr-id = <5 7>;

	};



	mx_pe: mx_rdpm_pe@0x00637000 {
@@ -100,6 +99,49 @@ 
		};

	};



	qcom,cpu-hotplug {

		compatible = "qcom,cpu-hotplug";

		cpu0_hotplug: cpu0-hotplug {

			qcom,cpu = <&CPU0>;

			#cooling-cells = <2>;

		};



		cpu1_hotplug: cpu1-hotplug {

			qcom,cpu = <&CPU1>;

			#cooling-cells = <2>;

		};



		cpu2_hotplug: cpu2-hotplug {

			qcom,cpu = <&CPU2>;

			#cooling-cells = <2>;

		};



		cpu3_hotplug: cpu3-hotplug {

			qcom,cpu = <&CPU3>;

			#cooling-cells = <2>;

		};



		cpu4_hotplug: cpu4-hotplug {

			qcom,cpu = <&CPU4>;

			#cooling-cells = <2>;

		};



		cpu5_hotplug: cpu5-hotplug {

			qcom,cpu = <&CPU5>;

			#cooling-cells = <2>;

		};



		cpu6_hotplug: cpu6-hotplug {

			qcom,cpu = <&CPU6>;

			#cooling-cells = <2>;

		};



		cpu7_hotplug: cpu7-hotplug {

			qcom,cpu = <&CPU7>;

			#cooling-cells = <2>;

		};

	};



	qcom,limits-dcvs {

		compatible = "qcom,msm-hw-limits";

		isens_vref_0p8-supply = <&pm8350_l5_ao>;