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: 158612 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2440615jaa; Mon, 18 Feb 2019 04:36:48 -0800 (PST) X-Google-Smtp-Source: AHgI3IZhHBvgtMeDNN5w5+P2sBZoygFYcgB7Y2aP1dhvEELh8fjDuaSYFNf0BfLSlpFK89Tdtqo/ X-Received: by 2002:a17:902:a414:: with SMTP id p20mr21733099plq.289.1550493408561; Mon, 18 Feb 2019 04:36:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550493408; cv=none; d=google.com; s=arc-20160816; b=G7hMKeuYktrlLgR79J0OR6opfc9gaIxWrVmkBzw40DooURs9QbVnAZLHaetD6NN94D HFgbT/v02AaY5MAv9YVb/l4MP5AWYCL+Yn4/LLrEqN85fe+8lzoy8KxyUMsDWtY8vqHy 4eAI4YKCx8z2aN4iH63i1oKj12duuabYPpX+mRQ+2asHUAJxbcqZBGij/nvxJuPcv3MJ ZtAoNYJv5pnongbrSIz06xtKiiUKe8405YbrC9FTnjVs3AEWlPUqNZ6dV+38BnNVqvfi 1Mpx8TNyRKRIsTm9ZJNRRklWpGZic3o2UAgZ9V8b1WSq9Wf2vWBIsk2Xpr8UlUuO0gm5 dXxg== 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=+/T2odwPAOajJVYEt3tg08DjIdaFRNW4UrgXx0uPhI8=; b=OMiGHNitebApbHQ1fqoVW7yuwFwB94gDB5bUgzDxp7AW1M4LzmEpcmfq+imUn6Fvwu u/c6oz6RHjQhKEb+9kFpubVmkmqkloVzVU9sygcEBXXPToN5ikG+uGP8CuUKqyPHd9h1 PUfhXVplhL/p5xq02S4KeLVehhLzRl39YBX3CZGhrw2+IOGyhEb0jfv7QU7oLncancxo AZQWcP1EHlGbqSMwfnTB7ckDWeyvTsZIW3DEfOrsqOPBSpXjw9MFyT0Mk7m5+O1uY5QE bMO2Y4PmSGST2cLeNYlUP+04AWGun1XXpPPkDKwaxKkqNZfV7XaIKnKe/baSDhisZ1Gp k/LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="RAc/0Ms/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 z13si13231618pgf.294.2019.02.18.04.36.48; Mon, 18 Feb 2019 04:36:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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="RAc/0Ms/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1729639AbfBRMgq (ORCPT + 32 others); Mon, 18 Feb 2019 07:36:46 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36652 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730873AbfBRMgo (ORCPT ); Mon, 18 Feb 2019 07:36:44 -0500 Received: by mail-wr1-f68.google.com with SMTP id o17so18200039wrw.3 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=HaeIn6+PVfftXhxI89SDL05+r2Low+kWVKb4N0TN2rxI9HeQqTm6OMQm4gJbVUzK+x 3becd+MfEek6oUEnZXPPT6H8aLO26EE7RcYerqVzfstreBH0IMXWsEVEoYKR98s+KFgH aM/Ad4PMoJtZY8hPp7OdqROzySCq4D/RihAEzqwz5eVdwr9QdPjGqJdf+2pa1UZXGXhV ps+kWFYUq8anU4lsiLWKZgJqLk/ZbUzHGO2fkAiwbO25dVjdIIavSkqb6n5m2H6NAmIt r6FZgNnr3BoUQMNJtHRMw6A3Oz1LULC8x0h22Q7zGWG3ay969Y+Vj1MItqU99DaaQXAj gDeQ== X-Gm-Message-State: AHQUAub4d2nL1D4t/qfL5NlRWuyibQoQs46ZHzqvODuYhbKXLF0hleXF gR+qjv1WGgPGwjEVuoFd/JXkxam8Rd8= 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 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";