From patchwork Tue Jul 31 18:45:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10551183 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 C5D631708 for ; Tue, 31 Jul 2018 18:46:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4BAE2B244 for ; Tue, 31 Jul 2018 18:46:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A88592B2FE; Tue, 31 Jul 2018 18:46:49 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3EADC2B32A for ; Tue, 31 Jul 2018 18:46:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=un+mD+PaTNDsIb2sBDEZmCiNwbRDYFikH2FVQU3AcKY=; b=F3UC6LVEhpp1Zp j5tNd7gysryJLsAyF6ZCBkRy16+IURMXOLVof5vDy3q5PsKlX/EwMPLJYM4iU0uHOhVBJXjmt6QhX GSwZGTX+EqvxaUZjbNc4YlVV38IVk6+Ki1sVfqJP/bF0jaWgLGoa2lRmrseMfBAHnGyKXcmozSqBs oLNWFwnuNkW1aD6n+IkgbPAZPf7etrhUT2Fv7oFZssymnRV0Epw2LRbm84bcC17gQ5Fh05vNuMgwe luTHL93DCV4SGfinzPTT5c5q+LLk4Zk01gq0tr22zV4g/bQE1u+vuH573IUJOMjhYcQJsH+CLJkdy r3X5J4ZpmXz1Sdk8xq6Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfO-0003Xj-V8; Tue, 31 Jul 2018 18:46:43 +0000 Received: from mail-pf1-f193.google.com ([209.85.210.193]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfA-0003IJ-9H for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 18:46:29 +0000 Received: by mail-pf1-f193.google.com with SMTP id j26-v6so6524758pfi.10 for ; Tue, 31 Jul 2018 11:46:15 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=pregnSMfkOaGBP4vqZw3v3Rj/ItF+UeK9Knvf5WfDP4=; b=COn0OLQlDazmwIkZLHWgIHWY+2Zeb9IGGTuzOV+tj0AsC4D6YHnknjz9vG+UI5cFO8 Fp109CFpiKVkGXgVl2OXT5+6zFPBIM4M/IV9w6Ej4ZxeYW1wx23WDy4wla2aIT/k0SUd gDc0S+vZra0KWwhMJ/Uqoolclk635HA5CCbRIUKFxe5BMGn8CduqukTCwfTUc5nCRO+o a7Pvc331hq5aze8Eh9H43YhtEK4Wos+Z5AmynjWQbOEx2zdxmNEFBV03TtxVt7Snlr1A WUqW+4ub2kzr6H92e9qvBgvHCoz/BgvpjDSG7g68BfVjLLRftRKSZGUnVtD+SPzJCIQb q5LA== X-Gm-Message-State: AOUpUlG7T83TitFD1a/Ff9MPEEvFTS2VYqLZTyUcznOxFiCBRqBlvKBF kS8nGmE+G1sjMjzvwJu2qM8THw== X-Google-Smtp-Source: AAOMgpfds2lT/E/rBjuOnkKDZlGAt8EfyHQXPu0vTVnZmPbs69tz1vuDZNyN4GNLZWnQzb6aGW/ZVw== X-Received: by 2002:a63:41c6:: with SMTP id o189-v6mr21971048pga.323.1533062774698; Tue, 31 Jul 2018 11:46:14 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id b21-v6sm4981683pgw.79.2018.07.31.11.46.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:46:13 -0700 (PDT) From: Matthias Kaehlcke To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v6 1/5] dt-bindings: thermal: qcom-spmi-temp-alarm: Fix documentation of 'reg' Date: Tue, 31 Jul 2018 11:45:52 -0700 Message-Id: <20180731184556.169290-1-mka@chromium.org> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_114628_328933_3DC9B156 X-CRM114-Status: GOOD ( 12.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Collins , linux-pm@vger.kernel.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The documentation claims that the 'reg' property consists of two values, the SPMI address and the length of the controller's registers. However the SPMI bus to which it is added specifies "#size-cells = <0>;". Remove the controller register length from the documentation of the field and the example. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- Changes in v6: - patch added to the series --- .../devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt b/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt index 290ec06fa33a..86fb41fe772f 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt +++ b/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt @@ -6,8 +6,7 @@ interrupt signal and status register to identify high PMIC die temperature. Required properties: - compatible: Should contain "qcom,spmi-temp-alarm". -- reg: Specifies the SPMI address and length of the controller's - registers. +- reg: Specifies the SPMI address. - interrupts: PMIC temperature alarm interrupt. - #thermal-sensor-cells: Should be 0. See thermal.txt for a description. @@ -20,7 +19,7 @@ Example: pm8941_temp: thermal-alarm@2400 { compatible = "qcom,spmi-temp-alarm"; - reg = <0x2400 0x100>; + reg = <0x2400>; interrupts = <0 0x24 0 IRQ_TYPE_EDGE_RISING>; #thermal-sensor-cells = <0>; From patchwork Tue Jul 31 18:45:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10551173 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 6E4DE14E0 for ; Tue, 31 Jul 2018 18:46:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F5062B244 for ; Tue, 31 Jul 2018 18:46:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 524492B2EA; Tue, 31 Jul 2018 18:46:37 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 05F222B244 for ; Tue, 31 Jul 2018 18:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7ALMsbiOjAL3eMXTmLRFMiR1kPewBIDIka54U5d1oUY=; b=hyAXHhgnZsd+Vg 782SZCQYjc2FWybzY9DY78G344XP7GsCi5mJrULHdfHEM8kGXsnD03YIyoi84a3Wmp5Jh8FRi7WuD tCSiOKxx0rPPmGM06AYcDyN8WYY46wQWArwsTF6JFhqhNldq2whPvZ9rbglA4reo9qBs1fNGPu9iY X6YPsQ+7MYnyCL4VTpY5d+cafuc0oljTiVr1ZWYMm4uE30IoiF49FPh6tbRz4mjp9UeBiE1sEMeQ/ XUHfF1KFNjl+f4b6qBAKaDx06mt1LO0QP2PTqzWMs38tQ/72X4xXEIBT6M4+MHriXiBQxg8RHN5lB PB8JPB7853I3XVmw/0LA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfC-0003Lb-VY; Tue, 31 Jul 2018 18:46:30 +0000 Received: from mail-pf1-f193.google.com ([209.85.210.193]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfA-0003IL-9N for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 18:46:29 +0000 Received: by mail-pf1-f193.google.com with SMTP id l9-v6so6531731pff.9 for ; Tue, 31 Jul 2018 11:46:17 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=XWHD3U11wghvwRII1kRUIs8QoNbRmHkZbA9xigt5SRw=; b=DaD0w+aNV9CqoaNN/gm16+QknxVhMO7uDRhCvf+BTHgvjOfH+t45jVh9M9LS06rrJ9 ib9IY5lvclpIN7ZA8wvSrBvru6ajnUfpjqyQYCn+XtAYsn/CGuKeft3bO7bloK4XWZS6 sHp7jdUEBQIqn3DTN2YsSfXollQFe2BuuaUytpV7Ey5JbbPCKtb+iiqntt9zPIoihCsg 8NV5EJvffT3JaD1lzz3Y5pPqNFvOxUoikMlNXEuWbnNxmhJpw+JZFKQXIdRkSDTekFH/ r77zVOF5l11h8XgTusqzKog0w+NfGcaHXROxRY7cKTVFo/U3znMqHqQOCwozZwOcg7S5 IkFw== X-Gm-Message-State: AOUpUlF8JopcB0PwCGjbtcngUqLtc10kNExpSzUiJWLAgLm4vzGg8H8B nwZPxxmBPkf2az4RbR4ad7QpYw== X-Google-Smtp-Source: AAOMgpftK6VTik1iP9nFlcx7ntOye747JELX84OSDJcz9G0DVVKUu/tcmDwuawxnh1cK9zEp6EzsSQ== X-Received: by 2002:a63:6441:: with SMTP id y62-v6mr21271003pgb.240.1533062776409; Tue, 31 Jul 2018 11:46:16 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id b21-v6sm4981683pgw.79.2018.07.31.11.46.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:46:15 -0700 (PDT) From: Matthias Kaehlcke To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v6 2/5] dt-bindings: thermal: qcom-spmi-temp-alarm: Improve thermal zone in example Date: Tue, 31 Jul 2018 11:45:53 -0700 Message-Id: <20180731184556.169290-2-mka@chromium.org> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180731184556.169290-1-mka@chromium.org> References: <20180731184556.169290-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_114628_330417_1AF378EF X-CRM114-Status: GOOD ( 15.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Collins , linux-pm@vger.kernel.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The current example for a thermal zone isn't very useful as reference since it would result in a hardware shutdown at 145°C, instead of allowing the system to try to shutdown gracefully. Without an ADC channel a maximum of two trip points is useful in practice for this sensor, with temperatures corresponding to the stage 1 and stage 2 'hardware trip points'. A critical trip point at stage 2 may allow the system to shutdown before a hardware shutdown at stage 3 kicks in. It should be noted though that by default the chip performs a 'partial shutdown' when the temperature reaches stage 2, which may prevent an orderly shutdown. The 'partial shutdown' can be disabled by software. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- Changes in v6: - patch added to the series --- .../bindings/thermal/qcom-spmi-temp-alarm.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt b/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt index 86fb41fe772f..0273a92a2a84 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt +++ b/Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt @@ -35,19 +35,14 @@ Example: thermal-sensors = <&pm8941_temp>; trips { - passive { - temperature = <1050000>; + stage1 { + temperature = <105000>; hysteresis = <2000>; type = "passive"; }; - alert { + stage2 { temperature = <125000>; hysteresis = <2000>; - type = "hot"; - }; - crit { - temperature = <145000>; - hysteresis = <2000>; type = "critical"; }; }; From patchwork Tue Jul 31 18:45:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10551191 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 B408B1708 for ; Tue, 31 Jul 2018 18:47:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3EAB2B244 for ; Tue, 31 Jul 2018 18:47:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 981B22B2F0; Tue, 31 Jul 2018 18:47:39 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 043562B244 for ; Tue, 31 Jul 2018 18:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BCPScf0v6NW1nHabqB37nEpy9kl8AU4jkIhqtjG9cAw=; b=TO3dBRcWQ+F/n7 ftWiKLJsBq5OUV6AS8s2I58UluJ2HokTACYEQ4YZUUD1f3TzEfJ9L2uKVnaVmU+7V6phuqy1QpaQL jv4qT355yz4selLm01A18UmD2SzMIY0iz62ysFlx1eOOa5z0OLuGZ2qJjnflXwSneVrKWpnsbV09Y JiGoZpiEUlph9SU+VhV7agfz+lduLcgs4OTIP+Rz+tC7QnbiZ4FAP6ircGX1W4o4YJj6Axvxqi+he tv/ZJupdfV0H0So5QomC9nY0EsbLM4CfrjutfNh69tR3aR4m2V1/0aFvwJK0qA7VC1XS8UFdAjcUT //NPFS+SAXsXxaQRLJWQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZgA-0004M5-UZ; Tue, 31 Jul 2018 18:47:30 +0000 Received: from mail-pg1-f194.google.com ([209.85.215.194]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfB-0003Ig-71 for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 18:46:31 +0000 Received: by mail-pg1-f194.google.com with SMTP id r5-v6so9526967pgv.0 for ; Tue, 31 Jul 2018 11:46:18 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=Q/YRFKb3RzI0H1RpA3VS7FFvDUztiE2CUhFcLa1cepw=; b=WTJulf/yQkklunPbw9I39IB6kPw6ZyIw7yGC7fSMwbycdGEFTw+2uCtv4kPncGOPLr 2UYUtYFjnDcjuBldymhsacOY6VKcrB7M2xSxihVgoCLYZYDsQ333S6lFRmogC20BfUVY SsKb6Uwb9wKdpJDp0XqKp6JWxeTQ4UCBqIiaHXAkRzXG80PpF2J30iHI7jh4wjmE/Sjx t1fFl87KRq93d2xNum1ucOcqa1BqyqQtuv0e8/DGt+b2uxnwQH28dk3Pts9Mq+svwIeM mH60297WUKaIRbtGVE2a+0ab3SVr03iDtDiG0CD6cIYXr7DYL0PPs4sE2rVfjBi/vgEs Covw== X-Gm-Message-State: AOUpUlGwJHUulyQ7FI7o080uj5l6B5wZUW74BMSAzhsAPUNixauLgAEB Tsho3LGHio4K6qmg0eOBv6fjFA== X-Google-Smtp-Source: AAOMgpd5Y9/gGZpcCGj2VNMQwFfy35IKEc6nOpW09ux6vVqe69BO8U4OWn65/YRQvZkmoyNio7VsZA== X-Received: by 2002:a62:20f:: with SMTP id 15-v6mr3962082pfc.100.1533062778045; Tue, 31 Jul 2018 11:46:18 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id b21-v6sm4981683pgw.79.2018.07.31.11.46.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:46:17 -0700 (PDT) From: Matthias Kaehlcke To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v6 3/5] thermal: qcom-spmi: Use PMIC thermal stage 2 for critical trip points Date: Tue, 31 Jul 2018 11:45:54 -0700 Message-Id: <20180731184556.169290-3-mka@chromium.org> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180731184556.169290-1-mka@chromium.org> References: <20180731184556.169290-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_114629_253538_BE8AE8A0 X-CRM114-Status: GOOD ( 26.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Collins , linux-pm@vger.kernel.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There are three thermal stages defined in the PMIC: stage 1: warning stage 2: system should shut down stage 3: emergency shut down By default the PMIC assumes that the OS isn't doing anything and thus at stage 2 it does a partial PMIC shutdown and at stage 3 it kills all power. When switching between thermal stages the PMIC generates an interrupt which is handled by the driver. The partial PMIC shutdown at stage 2 can be disabled by software, which allows the OS to initiate a shutdown at stage 2 with a thermal zone configured accordingly. If a critical trip point is configured in the thermal zone the driver adjusts the stage 1-3 temperature thresholds to (closely) match the critical temperature with a stage 2 threshold (125/130/135/140 °C). If a suitable match is found the partial shutdown at stage 2 is disabled. If for some reason the system doesn't shutdown at stage 2 the emergency shutdown at stage 3 kicks in. The partial shutdown at stage 2 remains enabled in these cases: - no critical trip point defined - the temperature of the critical trip point is < 125°C - the temperature of the critical trip point is > 140°C and no ADC channel is configured (thus the OS is not notified when the critical temperature is reached) Suggested-by: Douglas Anderson Signed-off-by: Matthias Kaehlcke --- Changes in v6: - fixed condition to check if ADC is configured in qpnp_tm_update_critical_trip_temp() - changed °C in logs to C - removed needless evaluation of qpnp_tm_write() return value in qpnp_tm_update_critical_trip_temp() - move assignment of chip->initialized to true to qpnp_tm_init(), where the lock is held - call thermal_zone_device_update() after initialization is completed - split some #define + comment in two lines to avoid exceeding chars per line limit - removed extra closing parenthesis in qpnp_tm_get_temp() - remove unnecessary parentheses around conditions in qpnp_tm_update_critical_trip_temp() and qpnp_tm_get_critical_trip_temp() - fixed indentation of call devm_thermal_zone_of_sensor_register() call in qpnp_tm_probe() Changes in v5: - patch added to the series --- drivers/thermal/qcom-spmi-temp-alarm.c | 158 ++++++++++++++++++++++--- 1 file changed, 140 insertions(+), 18 deletions(-) diff --git a/drivers/thermal/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom-spmi-temp-alarm.c index ad4f3a8d6560..b2d5d5bf4a9b 100644 --- a/drivers/thermal/qcom-spmi-temp-alarm.c +++ b/drivers/thermal/qcom-spmi-temp-alarm.c @@ -23,6 +23,8 @@ #include #include +#include "thermal_core.h" + #define QPNP_TM_REG_TYPE 0x04 #define QPNP_TM_REG_SUBTYPE 0x05 #define QPNP_TM_REG_STATUS 0x08 @@ -37,9 +39,11 @@ #define STATUS_GEN2_STATE_MASK GENMASK(6, 4) #define STATUS_GEN2_STATE_SHIFT 4 -#define SHUTDOWN_CTRL1_OVERRIDE_MASK GENMASK(7, 6) +#define SHUTDOWN_CTRL1_OVERRIDE_S2 BIT(6) #define SHUTDOWN_CTRL1_THRESHOLD_MASK GENMASK(1, 0) +#define SHUTDOWN_CTRL1_RATE_25HZ BIT(3) + #define ALARM_CTRL_FORCE_ENABLE BIT(7) /* @@ -56,12 +60,19 @@ #define TEMP_THRESH_STEP 5000 /* Threshold step: 5 C */ #define THRESH_MIN 0 +#define THRESH_MAX 3 + +/* Stage 2 Threshold Min: 125 C */ +#define STAGE2_THRESHOLD_MIN 125000 +/* Stage 2 Threshold Max: 140 C */ +#define STAGE2_THRESHOLD_MAX 140000 /* Temperature in Milli Celsius reported during stage 0 if no ADC is present */ #define DEFAULT_TEMP 37000 struct qpnp_tm_chip { struct regmap *map; + struct device *dev; struct thermal_zone_device *tz_dev; unsigned int subtype; long temp; @@ -69,6 +80,10 @@ struct qpnp_tm_chip { unsigned int stage; unsigned int prev_stage; unsigned int base; + /* protects .thresh, .stage and chip registers */ + struct mutex lock; + bool initialized; + struct iio_channel *adc; }; @@ -125,6 +140,8 @@ static int qpnp_tm_update_temp_no_adc(struct qpnp_tm_chip *chip) unsigned int stage, stage_new, stage_old; int ret; + WARN_ON(!mutex_is_locked(&chip->lock)); + ret = qpnp_tm_get_temp_stage(chip); if (ret < 0) return ret; @@ -163,8 +180,15 @@ static int qpnp_tm_get_temp(void *data, int *temp) if (!temp) return -EINVAL; + if (!chip->initialized) { + *temp = DEFAULT_TEMP; + return 0; + } + if (!chip->adc) { + mutex_lock(&chip->lock); ret = qpnp_tm_update_temp_no_adc(chip); + mutex_unlock(&chip->lock); if (ret < 0) return ret; } else { @@ -180,8 +204,72 @@ static int qpnp_tm_get_temp(void *data, int *temp) return 0; } +static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip, + int temp) +{ + u8 reg; + bool disable_s2_shutdown = false; + + WARN_ON(!mutex_is_locked(&chip->lock)); + + /* + * Default: S2 and S3 shutdown enabled, thresholds at + * 105C/125C/145C, monitoring at 25Hz + */ + reg = SHUTDOWN_CTRL1_RATE_25HZ; + + if (temp == THERMAL_TEMP_INVALID || + temp < STAGE2_THRESHOLD_MIN) { + chip->thresh = THRESH_MIN; + goto skip; + } + + if (temp <= STAGE2_THRESHOLD_MAX) { + chip->thresh = THRESH_MAX - + ((STAGE2_THRESHOLD_MAX - temp) / + TEMP_THRESH_STEP); + disable_s2_shutdown = true; + } else { + chip->thresh = THRESH_MAX; + + if (chip->adc) + disable_s2_shutdown = true; + else + dev_warn(chip->dev, + "No ADC is configured and critical temperature is above the maximum stage 2 threshold of 140 C! Configuring stage 2 shutdown at 140 C.\n"); + } + +skip: + reg |= chip->thresh; + if (disable_s2_shutdown) + reg |= SHUTDOWN_CTRL1_OVERRIDE_S2; + + return qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg); +} + +static int qpnp_tm_set_trip_temp(void *data, int trip, int temp) +{ + struct qpnp_tm_chip *chip = data; + const struct thermal_trip *trip_points; + int ret; + + trip_points = of_thermal_get_trip_points(chip->tz_dev); + if (!trip_points) + return -EINVAL; + + if (trip_points[trip].type != THERMAL_TRIP_CRITICAL) + return 0; + + mutex_lock(&chip->lock); + ret = qpnp_tm_update_critical_trip_temp(chip, temp); + mutex_unlock(&chip->lock); + + return ret; +} + static const struct thermal_zone_of_device_ops qpnp_tm_sensor_ops = { .get_temp = qpnp_tm_get_temp, + .set_trip_temp = qpnp_tm_set_trip_temp, }; static irqreturn_t qpnp_tm_isr(int irq, void *data) @@ -193,6 +281,29 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) return IRQ_HANDLED; } +static int qpnp_tm_get_critical_trip_temp(struct qpnp_tm_chip *chip) +{ + int ntrips; + const struct thermal_trip *trips; + int i; + + ntrips = of_thermal_get_ntrips(chip->tz_dev); + if (ntrips <= 0) + return THERMAL_TEMP_INVALID; + + trips = of_thermal_get_trip_points(chip->tz_dev); + if (!trips) + return THERMAL_TEMP_INVALID; + + for (i = 0; i < ntrips; i++) { + if (of_thermal_is_trip_valid(chip->tz_dev, i) && + trips[i].type == THERMAL_TRIP_CRITICAL) + return trips[i].temperature; + } + + return THERMAL_TEMP_INVALID; +} + /* * This function initializes the internal temp value based on only the * current thermal stage and threshold. Setup threshold control and @@ -203,17 +314,20 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) unsigned int stage; int ret; u8 reg = 0; + int crit_temp; + + mutex_lock(&chip->lock); ret = qpnp_tm_read(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, ®); if (ret < 0) - return ret; + goto out; chip->thresh = reg & SHUTDOWN_CTRL1_THRESHOLD_MASK; chip->temp = DEFAULT_TEMP; ret = qpnp_tm_get_temp_stage(chip); if (ret < 0) - return ret; + goto out; chip->stage = ret; stage = chip->subtype == QPNP_TM_SUBTYPE_GEN1 @@ -224,21 +338,19 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip) (stage - 1) * TEMP_STAGE_STEP + TEMP_THRESH_MIN; - /* - * Set threshold and disable software override of stage 2 and 3 - * shutdowns. - */ - chip->thresh = THRESH_MIN; - reg &= ~(SHUTDOWN_CTRL1_OVERRIDE_MASK | SHUTDOWN_CTRL1_THRESHOLD_MASK); - reg |= chip->thresh & SHUTDOWN_CTRL1_THRESHOLD_MASK; - ret = qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg); + crit_temp = qpnp_tm_get_critical_trip_temp(chip); + ret = qpnp_tm_update_critical_trip_temp(chip, crit_temp); if (ret < 0) - return ret; + goto out; /* Enable the thermal alarm PMIC module in always-on mode. */ reg = ALARM_CTRL_FORCE_ENABLE; ret = qpnp_tm_write(chip, QPNP_TM_REG_ALARM_CTRL, reg); + chip->initialized = true; + +out: + mutex_unlock(&chip->lock); return ret; } @@ -257,6 +369,9 @@ static int qpnp_tm_probe(struct platform_device *pdev) return -ENOMEM; dev_set_drvdata(&pdev->dev, chip); + chip->dev = &pdev->dev; + + mutex_init(&chip->lock); chip->map = dev_get_regmap(pdev->dev.parent, NULL); if (!chip->map) @@ -302,6 +417,18 @@ static int qpnp_tm_probe(struct platform_device *pdev) chip->subtype = subtype; + /* + * Register the sensor before initializing the hardware to be able to + * read the trip points. get_temp() returns the default temperature + * before the hardware initialization is completed. + */ + chip->tz_dev = devm_thermal_zone_of_sensor_register( + &pdev->dev, 0, chip, &qpnp_tm_sensor_ops); + if (IS_ERR(chip->tz_dev)) { + dev_err(&pdev->dev, "failed to register sensor\n"); + return PTR_ERR(chip->tz_dev); + } + ret = qpnp_tm_init(chip); if (ret < 0) { dev_err(&pdev->dev, "init failed\n"); @@ -313,12 +440,7 @@ static int qpnp_tm_probe(struct platform_device *pdev) if (ret < 0) return ret; - chip->tz_dev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, chip, - &qpnp_tm_sensor_ops); - if (IS_ERR(chip->tz_dev)) { - dev_err(&pdev->dev, "failed to register sensor\n"); - return PTR_ERR(chip->tz_dev); - } + thermal_zone_device_update(chip->tz_dev, THERMAL_EVENT_UNSPECIFIED); return 0; } From patchwork Tue Jul 31 18:45:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10551193 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 B948E1708 for ; Tue, 31 Jul 2018 18:47:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A80D02B2B3 for ; Tue, 31 Jul 2018 18:47:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 992D82B308; Tue, 31 Jul 2018 18:47:50 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 338DB2B2B3 for ; Tue, 31 Jul 2018 18:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jF3cQ8ffPlYGVmoR9fZRU9BLjqfFItEIP17wIktPeLc=; b=TQA3t80EZKyC/R 9Z7AaC0ygLiMqzZBPsqK4DJjAHcR+iBlV8SQpulXelMClvL4lPg4Sir/S2SqYHaqLJ3J3exYiyGSI izxcCxRqGAYpAK1URhm/FSW5HIfEGYHc/ISN+h6mEW0B9xV/8rJwvkFkgiAJoCHp4mMVm09Bk8FbJ W85FLBApFPLkOk05Sj55d5hGX2+QfBq9PAOvu6u1ZZULbBB7rYTACJxXkHtfrbHnFrADGtu28kmM5 mkXDWqcRkBeKIpg3sgUcszf7GatdkcgpXxIiSc10EmI4uQ5yjiRyjLnrJRZOrid39zmnai7QFHEcm NswtxINuaYXPTQxx3q8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZgN-0004YD-GC; Tue, 31 Jul 2018 18:47:43 +0000 Received: from mail-pg1-f193.google.com ([209.85.215.193]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfE-0003JN-CY for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 18:46:34 +0000 Received: by mail-pg1-f193.google.com with SMTP id k3-v6so9523441pgq.5 for ; Tue, 31 Jul 2018 11:46:22 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=76XyzsmzEYZUY9NhKGrjYdT4OLrEbkvqeBkWmOp81tA=; b=bF0/ytRuulDstSXGXJV90G0H4vhrx2BSl6gz6O46pjKUVmW0TWFOqYwW7rFlanKVxv LBNW4E7eIZstPRoK8axoUi2q2iSMCtBXieE7sCqUs01GqsYbVWkNWTwKFJIuHi8q/Vuv mN8CyZXDFO9MSwdH43slhvR5l3FoN4ZP44a3FtebSojjfuq94491GrSSsL1h2WjLF9gR 5B3mbqx1nTaUc/sVMnyXJuP4WkAu+oruGbEy6vjxoqZJSK7lePw4DIO0GOgXs752fjMj KbtXnujK9KdyrNLNBLPbFel2lHMi6LLErXPu7woFl5+DgxC6rsXJYMmFt6XV1MAke0Uv 9jnA== X-Gm-Message-State: AOUpUlEIyVseRyCYFDPfneUD7PrIPQMHAj2yMiOC2HVHQis3Dw7kQVRo OvlGGCfvHdRi2ewCiZs3fPb7Ww== X-Google-Smtp-Source: AAOMgpeQDSNeEPxjvyjwh+H1fn0Zw/3zHct3IoSK8/VxFYfrGOiAAvFWFJVkpWuurNASWC/Vky0TEQ== X-Received: by 2002:a62:5d55:: with SMTP id r82-v6mr23541738pfb.150.1533062781244; Tue, 31 Jul 2018 11:46:21 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id b21-v6sm4981683pgw.79.2018.07.31.11.46.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:46:20 -0700 (PDT) From: Matthias Kaehlcke To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v6 4/5] arm64: dts: qcom: pm8998: Add spmi-temp-alarm node Date: Tue, 31 Jul 2018 11:45:55 -0700 Message-Id: <20180731184556.169290-4-mka@chromium.org> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180731184556.169290-1-mka@chromium.org> References: <20180731184556.169290-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_114632_740886_35A82CEE X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Collins , linux-pm@vger.kernel.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the spmi-temp-alarm node to pm8998 based on the examples in the bindings. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- Changes in v6: - none Changes in v5: - added tag 'Reviewed-by: Douglas Anderson ' Changes in v4: - none Changes in v3: - changed node name from 'qcom,temp-alarm@2400' to 'temp-alarm@2400' - removed controller register length value from 'reg' Changes in v2: - none --- arch/arm64/boot/dts/qcom/pm8998.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi index 92bed1e7d4bb..7eea94701b23 100644 --- a/arch/arm64/boot/dts/qcom/pm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi @@ -11,6 +11,13 @@ #address-cells = <1>; #size-cells = <0>; + pm8998_temp: temp-alarm@2400 { + compatible = "qcom,spmi-temp-alarm"; + reg = <0x2400>; + interrupts = <0x0 0x24 0x0 IRQ_TYPE_EDGE_RISING>; + #thermal-sensor-cells = <0>; + }; + pm8998_gpio: gpios@c000 { compatible = "qcom,pm8998-gpio", "qcom,spmi-gpio"; reg = <0xc000>; From patchwork Tue Jul 31 18:45:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10551195 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 40A4414E0 for ; Tue, 31 Jul 2018 18:48:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 319432B303 for ; Tue, 31 Jul 2018 18:48:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 251F82B308; Tue, 31 Jul 2018 18:48:16 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AB4BD2B2B3 for ; Tue, 31 Jul 2018 18:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=P2qIRgKZI3QXGDtXjVGvMiJMHUub5fHXp1fcErfK4n0=; b=gKa775HKw74p6R T4R/BWWW0WLxIzOYDDXBtgH4mn9C7TstNYWTT9Fgq7BxZ3VrhUWAvvvBz2UMfszdL42PdUKFE3E78 1C0F2/mtB3jcezst+0tiBooh3RBHMAGhza4Si5YTpC+qr3hsGa6XrWFxT6BQdNgv1/oHU3hU0aUQF 1KqPuKRl806IneYz1YCPk5ZtuYSPzmtKRYsrjYJOLKbtvh8zz1BxjmqLmHHy2r1jk0I9ZNUpX+gmP BIA2Xy1c7lClTg4gHhmd5DItqMywncKheRBYSpmRg5BMXhJgq0nxkENjLkfnZW/R3vUyZ6B7X1cEP 5/KhMXqqFBv8i8Ui94Zw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZgj-0004ym-Fp; Tue, 31 Jul 2018 18:48:05 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fkZfG-0003Jo-D2 for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2018 18:46:38 +0000 Received: by mail-pf1-f196.google.com with SMTP id x17-v6so6540582pfh.5 for ; Tue, 31 Jul 2018 11:46:24 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=gF9UpcqWCQAPpTAYxBGWl2YKXDfCJhhLRmXour3w3OY=; b=Y7khJ7Ycmqyrz0l1z49FqwtmofjfzxXi7Pkm9f6GHRLMXqabzjdOHkLLR8GbjwMUPH qTmKUzdXP3BtLzKDZD9j+sDUKBrdbCR0fJN0Zvz1pkPcVkUAaX7XdboSmygt9GYbW6k8 C35oYsao8KKTyLlopgBaMuXN0Gt4Xy5P3DgPiwcBHkFyPRYqXeIHb7wdTFCfNsk5Z3Ms xENUKfT3ZvPCVL/3Lt80jsXmGzQhMtxeoXVT2bAowIkRKUJIh5elkQuFggbWlX4crnPZ 3GsMc6iGUq2Pb8acX4UIEzMmEOX+9u6dW0KgeBAfGuGeA79wgbCCoL7hsX1aMaY3woyR j6kg== X-Gm-Message-State: AOUpUlFhTq8fKyOGTxb9dvYqMGPqS051GSq7boWowolo4oE/DfSgrrqd ZcV4kxrao4ltkP51yf6eXkf1MA== X-Google-Smtp-Source: AAOMgpfnJeNT74Ik84Xtmb362AyNCkl7juPvgdh0EJ4/1hXnpWyobA6yAC9Fn0M/R51x5f5j3ct9+A== X-Received: by 2002:a63:e247:: with SMTP id y7-v6mr21619785pgj.231.1533062783269; Tue, 31 Jul 2018 11:46:23 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id b21-v6sm4981683pgw.79.2018.07.31.11.46.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:46:22 -0700 (PDT) From: Matthias Kaehlcke To: Andy Gross , David Brown , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Zhang Rui , Eduardo Valentin Subject: [PATCH v6 5/5] arm64: dts: qcom: pm8998: Add pm8998 thermal zone Date: Tue, 31 Jul 2018 11:45:56 -0700 Message-Id: <20180731184556.169290-5-mka@chromium.org> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180731184556.169290-1-mka@chromium.org> References: <20180731184556.169290-1-mka@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180731_114634_743298_8D7EB556 X-CRM114-Status: GOOD ( 14.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Collins , linux-pm@vger.kernel.org, Stephen Boyd , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , Matthias Kaehlcke , linux-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The thermal zone uses spmi-temp-alarm as sensor, the trip points correspond to the PMIC thermal stages 1 and 2. The critical trip point at 125°C disables the partial PMIC shutdown at stage 2. Without an IIO input the sensor only reports a limited number of temperatures: - 37°C for temperatures below 105°C - 107°C for temperatures >= 105°C and < 125°C - 127°C for temperatures >= 125°C (the numbers correspond to a stage 1 threshold of 105°C) Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- Changes in v6: - added 'Reviewed-by: Douglas Anderson ' tag Changes in v5: - removed 'stage2-shutdown-disabled' property from spmi-temp-alarm - updated commit message Changes in v4: - updated trip point temperatures to match stage 1 and 2 ones - disabled stage 2 shutdown - updated commit message Changes in v3: - moved 'thermal-zones' node to the beginning of the .dtsi Changes in v2: - defined 'thermal-zones' node in pm8998.dtsi instead of using a label to refer to it - use 105°C hardware trip point as critical trip point - reduced number of trip points to 2 - lowered temperature of passive trip point - updated trip point names and added labels - updated commit message --- arch/arm64/boot/dts/qcom/pm8998.dtsi | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi index 7eea94701b23..34c259ba3919 100644 --- a/arch/arm64/boot/dts/qcom/pm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi @@ -3,6 +3,31 @@ #include #include +#include + +/ { + thermal-zones { + pm8998 { + polling-delay-passive = <250>; + polling-delay = <1000>; + + thermal-sensors = <&pm8998_temp>; + + trips { + pm8998_alert0: pm8998-alert0 { + temperature = <105000>; + hysteresis = <2000>; + type = "passive"; + }; + pm8998_crit: pm8998-crit { + temperature = <125000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + }; + }; +}; &spmi_bus { pm8998_lsid0: pmic@0 {