arm64: dts: msm8916: thermal: Make trip names consistent (032d7c6e) · Commits · 戴 / test

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

+12 −12

Original line number	Diff line number	Diff line
		@@ -180,19 +180,19 @@
		};

		thermal-zones {
		cpu-thermal0 {
		cpu0_1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 4>;

		trips {
		cpu_alert0: trip0 {
		cpu0_1_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cpu_crit0: trip1 {
		cpu0_1_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -201,7 +201,7 @@

		cooling-maps {
		map0 {
		trip = <&cpu_alert0>;
		trip = <&cpu0_1_alert0>;
		cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		@@ -210,19 +210,19 @@
		};
		};

		cpu-thermal1 {
		cpu2_3-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 3>;

		trips {
		cpu_alert1: trip0 {
		cpu2_3_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cpu_crit1: trip1 {
		cpu2_3_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -231,7 +231,7 @@

		cooling-maps {
		map0 {
		trip = <&cpu_alert1>;
		trip = <&cpu2_3_alert0>;
		cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		@@ -247,12 +247,12 @@
		thermal-sensors = <&tsens 2>;

		trips {
		gpu_alert: trip0 {
		gpu_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		gpu_crit: trip1 {
		gpu_crit: gpu_crit {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -267,12 +267,12 @@
		thermal-sensors = <&tsens 1>;

		trips {
		cam_alert: trip0 {
		cam_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cam_crit: trip1 {
		cam_crit: cam_crit {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";

Admin message