From patchwork Mon Feb 18 12:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 158607 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2440137jaa; Mon, 18 Feb 2019 04:36:18 -0800 (PST) X-Google-Smtp-Source: AHgI3IZiwdcbljMEW3WoLixFUEUkkEsXLf7HbwtdfNMznliRZgIKURtE6FfZvVbuhUDwB0ZTJW6q X-Received: by 2002:a63:40c1:: with SMTP id n184mr17985164pga.225.1550493378293; Mon, 18 Feb 2019 04:36:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550493378; cv=none; d=google.com; s=arc-20160816; b=YTyQf+TQ+oxG1tNaZ0dSQ01RjJQ/5b6eQhme+WAF3mqgRm3oOjhKW8vRNBYhT3QItx 7wYScAU4q5uiF7Q8kOsJp8slWzLJqyfv/8pwP7l0W/9rHBzRzVBRUt+aMEKXGpAM3xWp lwzyOJwWNwAaoblKRT3rJOhYtqw/7OuUnoLUnTXmxldsQK8eL9N0xE5WbG2QOinEXA9q 4E9tTyyGPliWL451aNIRfUQVtNJ9lcn5qmndEouI81T+k4kZ4QXFIJN0VuagubMUdXU+ gO2vLzSQl3JXSpCzQnjhNzUKJw2w0uOtuhluban6jAzjPcDklEKkfjRp3XiUzOfwX1ts Wuzw== 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=N587anwGGRTU9xPHyvLRXOqqrWAJRORm+3kTnyypRTo=; b=h7R+dG8tRQ/CEHAAN0gkTZ5973Joz6vm42UeLjUGH8korDbYQXZCbA89TUKq/uSl8P 6/GOenmXGkAEt4YHB5ZdfsfLjhfVvpJ5+GU/PUtITqHu4w+8yvuokcAGHtPviLffSIQ9 D9Wu0AZRf4jyuBpdaOq/s0nCLBWnvklSEg4kQbwdzypOMA655vpufpCFJlJtrHbG769Z j21xOr+7fbqa5tMA3jaZiAuJ2bulFMx+88HhedcDLs/4ay7MFfpI5hzhTY/M/4IrqML8 +NslOUU3zMNnM5Wm1y73Y1rROZYlK33RDh29sbJey3IcB5JFsgGeKcUFGYbZFrc6fEQc fm0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jc4l8IJ9; 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 e21si12771788pgg.571.2019.02.18.04.36.17; Mon, 18 Feb 2019 04:36:18 -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=Jc4l8IJ9; 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 S1730953AbfBRMgP (ORCPT + 32 others); Mon, 18 Feb 2019 07:36:15 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41096 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730702AbfBRMgO (ORCPT ); Mon, 18 Feb 2019 07:36:14 -0500 Received: by mail-wr1-f66.google.com with SMTP id n2so6020682wrw.8 for ; Mon, 18 Feb 2019 04:36:13 -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=N587anwGGRTU9xPHyvLRXOqqrWAJRORm+3kTnyypRTo=; b=Jc4l8IJ90kvEkU8G1HaGwYqWWvLzLSG43nkVF/20nkF5ZWfVqNnP8nuQpvSs8RimI8 OxkB13Gx6P/0jqz80P5RZbmXmTSIHd8G9TaQL3oE1SYU4NSW2PaQg4Ab0ePEPhpDyhba W84QPQ+M6AcxkqTawY79jJhuE459Hyuw/zbZloMYvHBWcHgR09sB09g10GmBp9zpZW+4 J4bZHvrKhaRsPPfYgfNJs6QzHYUh9jzyPmb8Dab/TQWAKcNdSgHiyP24GX/i5U3hiRUj 4UfhZCMw9R4IJ0H06DmJhQOYKMq97cm8PqV9GLtKxqogg0NJw8F1UMobU/GF3wwayrrJ aVkg== 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=N587anwGGRTU9xPHyvLRXOqqrWAJRORm+3kTnyypRTo=; b=QHQa988siqIxMkbmnkZD9gsLjgyeOYFk34SCMZg1apqGIdc46RjObEJdzw2/aBLv5y meyS+Ae983anQbTMVBaMOikjIWjx5QWQdOdZmC7v3aU6JIcaqoHUnVNbkKlCQ7F1+sdk lqQpKyihHPKQJfoB9OvW2WdyCT2lKFZqAyRkxJgWLP/Z8coMkCwkeJzlFuRQJV1BSjla gLWoESBfi1BeBNgB3+O+OjFwgiz51z+ClVQmarj2w/CHgPEgE2e6NVAOInBakV14qBDD hIU/ZAeQ9Xy5HCNbaSISKKDqWCxQ7jqT8GFAbgte6vvJk6uiLA02RbCToI9/DCMH6vYF uGqw== X-Gm-Message-State: AHQUAuZaPySi8vQ/ibjmczU9nw1eHYZFdD3jgauJsY/bUu33H0eSicJ/ 62QGbPZ/CvWCFknni3seerifIYJQFjM= X-Received: by 2002:a5d:5544:: with SMTP id g4mr16312897wrw.269.1550493372600; Mon, 18 Feb 2019 04:36:12 -0800 (PST) Received: from localhost ([49.248.190.152]) by smtp.gmail.com with ESMTPSA id o2sm18596461wmo.33.2019.02.18.04.36.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Feb 2019 04:36:12 -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 06/12] arm64: dts: msm8998: thermal: Fix the gpu sensor number Date: Mon, 18 Feb 2019 18:05:20 +0530 Message-Id: <6c8750d78d375ed288d95fa9af8d330f9ed62958.1550493113.git.amit.kucheria@linaro.org> 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 The GPU sensor is sensor ID 13 on controller 0 Fixes: 4449b6f248d9a1 ("arm64: dts: qcom: msm8998: Add tsens and thermal-zones") Signed-off-by: Amit Kucheria --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 662ca458e64a..ba579cf10254 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -504,7 +504,7 @@ polling-delay-passive = <250>; polling-delay = <1000>; - thermal-sensors = <&tsens1 3>; + thermal-sensors = <&tsens0 13>; }; }; From patchwork Mon Feb 18 12:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 158611 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2440521jaa; Mon, 18 Feb 2019 04:36:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IYMEceiwFmEndoqhaTDflNC63EOEJgPFoq8XvT+iXanPNyRiX7SzGRDQEcdBHz1wDP4SJwi X-Received: by 2002:a62:5003:: with SMTP id e3mr24611632pfb.23.1550493401969; Mon, 18 Feb 2019 04:36:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550493401; cv=none; d=google.com; s=arc-20160816; b=QhWwKSzIcyhGYYzN8eH/xYHsAEH31xDygTxXPgpFFNAXe5MoD3H6kG4GZgvqwZNMho YAIJfKv2HVT/3pQOyBIvD7iwvrgUjgQNjWHWzmadKYw/wnyXiVU0bqDn3pL7EDwSgwp7 cLAy0mFShK9g009xrCX+BrP8Wl0Cb/wQS6Ap4jRs+w5epfBYpBexGH1GbnPowC37B2IM IcVPcDsyWV8nJ02mCRzOkPn4ULLG00OmX3zhKmfLK4wEVS8dh0bIeMLtJE2bwqM6TFb7 92VYFD6jLSKyyd3fXV9iDBdnwXdhEo8pjy+PI6mZ4EJOaU7jlfzCldlJs7auquztpkFe EDNQ== 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=IpwvUsCE/RAgILwZtM1QTDRD/UhcFwjv0M37jWKuSgs=; b=QuMzDDqoFp7q8QTHHgQWb0sP9pdMQiSF9ZSOVGh5hwKIw2ARc/GWDb+CMj8hzs0i7v yytU8DaY1iZ+0DSaWHAOENz+Dr1y17W6lX/TaxstvkONT36jYByBLj8qSbqXadouZlIB QrQ1aabgC+sE891RfVIYiZIY+XU0GO0ISuIJ9a+TdRQc8Uv0Qak2asv1NWk8aXT1JKeN h4Ce33kHRZ5KGbyELQSiW9U7MT7SeGu9U9lW4KCddwwg33cb0vMGnbVV0z/RoFE18ANo bjgtt9oPxD3l5HzEij7F5LkAhp6uU8266/vchn+/0mt9vHUp6JKi5M7nQmTQLwxfJLyG mpbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ral1zlD9; 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 128si12094948pfz.86.2019.02.18.04.36.41; Mon, 18 Feb 2019 04:36:41 -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=Ral1zlD9; 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 S1731019AbfBRMgk (ORCPT + 32 others); Mon, 18 Feb 2019 07:36:40 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38264 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730873AbfBRMgj (ORCPT ); Mon, 18 Feb 2019 07:36:39 -0500 Received: by mail-wm1-f67.google.com with SMTP id v26so16937862wmh.3 for ; Mon, 18 Feb 2019 04:36:37 -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=IpwvUsCE/RAgILwZtM1QTDRD/UhcFwjv0M37jWKuSgs=; b=Ral1zlD9Ja6qvxYD7EDuuGfYe0oYdXn4rrX+YF27Pjenh0T2CZZUUJTQt3q8KaOlj6 jqWvxJtRwYY/5q2l2ZSMF/wtj/VXCjeswMLwDWgw8PKpGrmfQvwsy6YtU8JsntDsjBeL to2eRMAMi0CSUjnRg5ZwchnAUpFC/ERZiWttWEKYcWjnpHpYds798jIOQk/p0lTveqUb 811pJIF13oABrY2sG9W5n7xjTUWGUyQu4KAz+/n1fB4+YtFhaddnrKZxZmwUltFQZvga uZS0H8z5McSgx2TWx/kJ2a7kN+cQsO24F72wZ10kP3jrf70su+rRYucOcoRoRajlQnLS m8og== 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=IpwvUsCE/RAgILwZtM1QTDRD/UhcFwjv0M37jWKuSgs=; b=Ro8BTseadKQtxrP4Ex9sHXvAFQ4DL9gD/M/g38ldq0VveNE2znzJ4hxeUVeva2Xzlb UsrfJTw0YGd6pPWlg2YpO+pH9BwiuG+LajMyXe8wEpxzfBtObRAf9Mv7S0iEyfj2V4J4 7pQpBsudRvEoqQZ6U59g6MQ7/3kGD8vOWpi7XaBhUXnzfPuphTVcvW1sZ4SZFqAd0rWp CzOyHgqqZPbigM30lDl/6Ipq7/cPbrruBhhbLql1tpy8F+o/l+lxNDNQpl6CxkM7E2Ud lPGqAb8ziHnifj30mPB0QLy2CnWrN2PVYSUwAh/0k2iajIqbuJ66Js1/vAW/ZHRa/W5w 7XUQ== X-Gm-Message-State: AHQUAubFp4w2ASfW/a1t6eHayqlpEhI7vkddYClGM26+rFX2CpETtYJt cvDqHJOBf0UjutbQPyU1CyBk+lNEsZM= X-Received: by 2002:a1c:9cce:: with SMTP id f197mr15774104wme.135.1550493396645; Mon, 18 Feb 2019 04:36:36 -0800 (PST) Received: from localhost ([49.248.190.152]) by smtp.gmail.com with ESMTPSA id j1sm4877756wme.4.2019.02.18.04.36.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Feb 2019 04:36:36 -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 10/12] arm64: dts: msm8998: thermal: Make trip names consistent Date: Mon, 18 Feb 2019 18:05:24 +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/msm8998.dtsi | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 26a493af0866..f05ce858c423 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -332,20 +332,20 @@ }; thermal-zones { - cpu-thermal0 { + cpu0-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 1>; trips { - cpu_alert0: trip0 { + cpu0_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit0: trip1 { + cpu0_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -353,20 +353,20 @@ }; }; - cpu-thermal1 { + cpu1-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 2>; trips { - cpu_alert1: trip0 { + cpu1_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit1: trip1 { + cpu1_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -374,20 +374,20 @@ }; }; - cpu-thermal2 { + cpu2-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 3>; trips { - cpu_alert2: trip0 { + cpu2_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit2: trip1 { + cpu2_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -395,20 +395,20 @@ }; }; - cpu-thermal3 { + cpu3-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 4>; trips { - cpu_alert3: trip0 { + cpu3_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit3: trip1 { + cpu3_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -416,20 +416,20 @@ }; }; - cpu-thermal4 { + cpu4-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 7>; trips { - cpu_alert4: trip0 { + cpu4_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit4: trip1 { + cpu4_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -437,20 +437,20 @@ }; }; - cpu-thermal5 { + cpu5-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 8>; trips { - cpu_alert5: trip0 { + cpu5_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit5: trip1 { + cpu5_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -458,20 +458,20 @@ }; }; - cpu-thermal6 { + cpu6-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 9>; trips { - cpu_alert6: trip0 { + cpu6_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit6: trip1 { + cpu6_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; @@ -479,20 +479,20 @@ }; }; - cpu-thermal7 { + cpu7-thermal { polling-delay-passive = <250>; polling-delay = <1000>; thermal-sensors = <&tsens0 10>; trips { - cpu_alert7: trip0 { + cpu7_alert0: trip-point@0 { temperature = <75000>; hysteresis = <2000>; type = "passive"; }; - cpu_crit7: trip1 { + cpu7_crit: cpu_crit { temperature = <110000>; hysteresis = <2000>; type = "critical"; 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";