From patchwork Mon Feb 18 12:35:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 10817911 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8C1A71575 for ; Mon, 18 Feb 2019 12:36:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7861D29337 for ; Mon, 18 Feb 2019 12:36:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C3ED2A78C; Mon, 18 Feb 2019 12:36:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1092C29337 for ; Mon, 18 Feb 2019 12:36:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731025AbfBRMgp (ORCPT ); Mon, 18 Feb 2019 07:36:45 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45636 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730573AbfBRMgo (ORCPT ); Mon, 18 Feb 2019 07:36:44 -0500 Received: by mail-wr1-f67.google.com with SMTP id w17so18131216wrn.12 for ; Mon, 18 Feb 2019 04:36:43 -0800 (PST) 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=+/T2odwPAOajJVYEt3tg08DjIdaFRNW4UrgXx0uPhI8=; b=RAc/0Ms/+c5eP5RO7qYQxqcnP39mIQjxr5SLRipCO3f4VWJAZPTlPbO3UK+K36CxSv zxxUBzeZ+n22AFSS85fl/6/6nag8TyOB0OzKqV05yKSXMKdS0rl48/n5AIIAiTztw6Zs Zq1+MDzrpymubQW5T79ZuHFdHh1uopRKKhGVIPrMWlBaCXy9wS2qZyZeb07YR5z9wif6 w3gaynTrSMk/RCNLIiYymcs0yG2lFtg8ol7PXhKnCWAX89YMcLvyWShahij23Mh1+aem c+rig2Mo9VjVcsrgeKsBkiGFsihpUugJG9aQMJ7DS9Ptt5ASODvbs4XU9+ZQUEPLatc1 wQsg== 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=+/T2odwPAOajJVYEt3tg08DjIdaFRNW4UrgXx0uPhI8=; b=KtL8vv1guUpTUXjNXWXwM+eZ4Rof74Sz/hihHDJUzzDg3Lb3sdaX8QmZs4XVS/Xkz2 DVWfnqaN8J/0S0oWp5U2JM/F5MSdefIs6QaDOm7/nCo0z0fy+bcO3og90/h+G2r7O/cC gzqPBEk4IsUmL0TrStcgM8CwjTIVJqgoLV1EUVqzhYs3dpZO9t9KfXQSrkrufbqHL2Ko 2gRIzy9QgeWxmRgIh87lRnm/76JiH2o3pxMLbOFV7yqLpPYrJ1yEaBI9/Hw7oUJp2bvu EZYK/x5mYuQ6vE39CSXzACwGckiga58NUXzObHqASm3NpR72Pws/MxbzIok9gQa09yN0 5CPw== X-Gm-Message-State: AHQUAuanyeZKkkFLNFs364PGiqzRxKYwPVZoWKqnDLlJXS/MqA+0r2yO 8/KlDSuyPJHrMhdJ0LN0bSkTlQ== X-Google-Smtp-Source: AHgI3Ib1j+YJunxYuv/OzmigBmQ5SmrWPUPioQiW5FzdM67qK8i6N+66FlaqHM8ZU7Yn3cE2RcP54g== X-Received: by 2002:adf:9e47:: with SMTP id v7mr17251721wre.190.1550493402609; Mon, 18 Feb 2019 04:36:42 -0800 (PST) Received: from localhost ([49.248.190.152]) by smtp.gmail.com with ESMTPSA id o2sm18598266wmo.33.2019.02.18.04.36.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Feb 2019 04:36:42 -0800 (PST) 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 v1 11/12] arm64: dts: msm8916: thermal: Make trip names consistent Date: Mon, 18 Feb 2019 18:05:25 +0530 Message-Id: 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 X-Virus-Scanned: ClamAV using ClamSMTP 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(-) diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 9e4a82e5e0b4..2002f5f91a83 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 5>; 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 4>; 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";