From patchwork Fri Mar 29 10:12:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 161418 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1835312jan; Fri, 29 Mar 2019 03:13:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwU93uYZnGEztlZJJhvczJbmqpAs5Zw6Uz3pcuKxdBNhQksh6LWzpIKCtEoePLv1bk/+t4m X-Received: by 2002:a63:6985:: with SMTP id e127mr45489065pgc.101.1553854420112; Fri, 29 Mar 2019 03:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553854420; cv=none; d=google.com; s=arc-20160816; b=OoVmgHkGY+9R9F1XuGxD4Ik5ngpZyLRqlbrMKaJkuaGeYP4/2BSkLoZ97QPkOKnRFR ZrUIDP76MIVfwSJ/X/2vyAWg/OJkDM3YL3gROmKqKWV+1vZ/A5tJUsLoEzhcUjBG9I7g qJLV21hnUVD/a4glCrtpCY40Wup3dYzN59nKbbAgpioHXxmx/P31UCgguTluTqrX9xer qBNXcXLITZdMck3KMrO/LXWa9WChn27A8Bhy2nl/MzIzbOveIr7s96QTs4Vgz2e2QrD5 WGoP/VPzddfPSm1gTMrez0plnQfa7I1R+zS1e3Kr9zCf5ejsmzecTjRMo8GUcxxiiGuj e2Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=7Xe7EiqZq0M1Qyy2HtL4P1xMmE3v1eI2RJwikfAYNmQ=; b=N5haIoDUefJx2t/3wEYHq75tUiKzMPM6Aa8s3e/uZ0wCp1yn/5FEHQ0M4ECtHfK9eW u6ECHHRNTIc8ewWNIW2guJoKntROP5OqzFrMqSvj0AABwocAFwNvPmPdQMMKlMqLrycT T1NUY0oGMpiq4NEL+9d5I2VO05zUWuUhhTTpkNWAAE+BqLYKJM10yNl7jzDvIBy0A1H4 w/bklbj1p/Ohx2L5WuffjzF6KBHM7PPHgFNsXj3rkoTLma83XGqxHBE2/jE2bZG3Dip/ xR/O2citpKUuLwSUdjmexvUr8Gm6cGNwRffe93IMmFpJ+Y7kARyCyt+17zG+vvKvRbty cA2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ssaX2K4+; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q13si1535168pls.284.2019.03.29.03.13.39; Fri, 29 Mar 2019 03:13:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ssaX2K4+; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727654AbfC2KNi (ORCPT + 15 others); Fri, 29 Mar 2019 06:13:38 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37982 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729292AbfC2KNh (ORCPT ); Fri, 29 Mar 2019 06:13:37 -0400 Received: by mail-wr1-f68.google.com with SMTP id k11so1873659wro.5 for ; Fri, 29 Mar 2019 03:13:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=7Xe7EiqZq0M1Qyy2HtL4P1xMmE3v1eI2RJwikfAYNmQ=; b=ssaX2K4+U8rP7Q0pUqz/wu/qqNVlJBHWFdV4egfy2k2mRv2xucCpxxCRAGCcL8+Wzw SLMh/yNAYdd78yj4chO0L9Pv3OuiKQgS9ndmefToa6SECQ++tYmdCogLBYpsJcoDwTvE WGIq4zSI606OVoGUogBr46guvmnbcZIWDbmA4dopKQwx/d8tjuyD3uM0TmnugnP7bt+v E9Y2Kgqr9VB59WnRnzEO67oCL4KhUwy1H85pOthhyjF9QdVCwUDA+0VUXGnWruz2q/s+ 9A3sRN0cjaeV2ULaiGz9S/vVsG/ntpLMKfufDPzXoB4vpJ+z8t6JEW0gmmsdmjgKPooR qLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=7Xe7EiqZq0M1Qyy2HtL4P1xMmE3v1eI2RJwikfAYNmQ=; b=OLHqNfWgPL/YRJ++r+o0SClD9nUzmnuRwPpLlm4P0dx3adGonYfWw6Sa1vDyjOXRMG 7aC4H1cw3b1v4xb/m9ENciLyPpKdvpkeVjuvXlCY7fwVSe88d7t6IVyx6ugGDjJBalku 563skFdtr7TixUl5u09U85extUiExgbZJI2l5Y7cUdehBBQqPaqdQ/Y54JSpsVS1GZIe SRvtw5q6p8u1Xo2dogoivK1ktOoNV5MZ50tYXDqSI1TaK9wA/ScJJ3ezWDoHmH/XW+ft KUehUjraMlrrKRe+tfkKXKuEUj187vkJF0Ro/EURSoVyHrhL9kGijtw6b3pg70GtVRhn 37mg== X-Gm-Message-State: APjAAAVKYKSqhJg2900Lp3XKcU82yfqTpmWEVSsNDG8Gzmeu9PgFwt1J Oo/pbMSn3a5bKwdMds/T/giY7CyqyMk= X-Received: by 2002:adf:82f0:: with SMTP id 103mr30601778wrc.260.1553854416276; Fri, 29 Mar 2019 03:13:36 -0700 (PDT) Received: from localhost ([49.248.196.175]) by smtp.gmail.com with ESMTPSA id n189sm2557811wmb.28.2019.03.29.03.13.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Mar 2019 03:13:35 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, andy.gross@linaro.org, David Brown Cc: devicetree@vger.kernel.org Subject: [PATCH v2 11/13] arm64: dts: msm8916: thermal: Make trip names consistent Date: Fri, 29 Mar 2019 15:42:17 +0530 Message-Id: <83bd84ec3a4ed9c4758f1c9bdf5168048e1f3b39.1553853990.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Maintain naming consistency with what was landed for sdm845. Simplifies parsing for test tools. Signed-off-by: Amit Kucheria --- arch/arm64/boot/dts/qcom/msm8916.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index c8aa9a0986d2..ea734b98ec96 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -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";