Merge "ARM: dts: msm: enable pmic alarm thermal zone mitigation for Gen3 platform" (34ebb16e) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+31 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, 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
		@@ -173,3 +173,33 @@
		#size-cells = <1>;
		};
		};

		&thermal_zones {
		pm6155-1-tz {
		polling-delay-passive = <100>;
		polling-delay = <0>;
		thermal-governor = "step_wise";
		thermal-sensors = <&pm6155_1_tz>;
		wake-capable-sensor;

		trips {
		pm6155_trip0: trip0 {
		temperature = <95000>;
		hysteresis = <0>;
		type = "passive";
		};

		pm6155_trip1: trip1 {
		temperature = <115000>;
		hysteresis = <0>;
		type = "passive";
		};

		trip2 {
		temperature = <145000>;
		hysteresis = <0>;
		type = "passive";
		};
		};
		};
		};

arch/arm64/boot/dts/qcom/sa6155-pmic.dtsi

+60 −0

Original line number	Diff line number	Diff line
		@@ -335,4 +335,64 @@
		};
		};
		};

		pm6155-1-tz {
		cooling-maps {
		trip1_cpu0 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm6155_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};
		};

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

+120 −0

Original line number	Diff line number	Diff line
		@@ -164,6 +164,8 @@ pm8150_1_gpios: &pm8150_gpios {
		};
		};

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

		&thermal_zones {
		pm8150_2_temp_alarm: pm8150_2_tz {
		polling-delay-passive = <100>;
		@@ -189,5 +191,123 @@ pm8150_1_gpios: &pm8150_gpios {
		type = "passive";
		};
		};

		cooling-maps {
		trip1_cpu0 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm8150_2_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};

		pm8150_tz {
		cooling-maps {
		trip1_cpu0 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm8150_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@
		gpuss-max-step {
		trips {
		gpu-trip0 {
		temperature = <100000>;
		temperature = <105000>;
		};
		};
		};

arch/arm64/boot/dts/qcom/sa8195-pmic.dtsi

+174 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,64 @@
		type = "passive";
		};
		};

		cooling-maps {
		trip1_cpu0 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm8195_1_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};

		pm8195_2_temp_alarm: pm8195_2_tz {
		@@ -146,6 +204,64 @@
		type = "passive";
		};
		};

		cooling-maps {
		trip1_cpu0 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm8195_2_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};

		pm8195_3_temp_alarm: pm8195_3_tz {
		@@ -172,5 +288,63 @@
		type = "passive";
		};
		};

		cooling-maps {
		trip1_cpu0 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU0 (THERMAL_MAX_LIMIT-1)
		(THERMAL_MAX_LIMIT-1)>;
		};

		trip1_cpu1 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU1 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu2 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU2 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu3 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU3 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu4 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU4 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu5 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU5 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu6 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU6 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};

		trip1_cpu7 {
		trip = <&pm8195_3_trip1>;
		cooling-device =
		<&CPU7 THERMAL_MAX_LIMIT
		THERMAL_MAX_LIMIT>;
		};
		};
		};
		};