From patchwork Thu Feb 25 18:33:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 387283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F17BC433E9 for ; Thu, 25 Feb 2021 18:36:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E11C64F1C for ; Thu, 25 Feb 2021 18:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232847AbhBYSg2 (ORCPT ); Thu, 25 Feb 2021 13:36:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233585AbhBYSea (ORCPT ); Thu, 25 Feb 2021 13:34:30 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A53EC0617A7 for ; Thu, 25 Feb 2021 10:33:49 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id h4so4338782pgf.13 for ; Thu, 25 Feb 2021 10:33:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hbzI6fdWGKlpcX3m5xnv8gjEnUTy4qQ9fPW3EbzDqxY=; b=SQLrxsFk9ckN3zW4wZSc08SFRP8cwgoLgjqjUAjNmoCehcPjUXM+N7VyVmkdCdwmX9 +VjRViVLyyC662GjT+QQloPmUvqR5qYt9pDvjFdw2YB6teRjnhpfWn64lzjc2nBxPkj5 22XSKvP/3X1oTEo9TzEnHULHDKNJBx17QTcso= 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=hbzI6fdWGKlpcX3m5xnv8gjEnUTy4qQ9fPW3EbzDqxY=; b=D5NuMTh+If+4NvxQGJsbbKlvcAbczxdkRW95k+J65tVfHYyf7jpnCW5I1xrCXzgYp3 afLWW4cx78f2PpS1oFhWWh2fAqOH230rUE3kk33CboQpWQvZnrD5CTRAhKvRljB1huRX ZUXA+0GIcFXQAxkbKg9aGr2Re8SFkOw6jJVwOTToG7aRSsQspg82uVHW1AxrMvss3Yn9 71f7IXjUD1iDHz7QInpHsdbMgym0zs0evjKt2pVTVMrxX7GWlmrFzDJlEaaOXy/at2an oE9hyb1c1fyyjOcU+8HRfckxfya83AQhCD1HHGu6WyRh4FrcYsZ5noNTyEaRd1iY9d2s /Bkg== X-Gm-Message-State: AOAM530U78Meg2Ay2zYHNtzLsrJHzslACyqt9y95Ezpg71rdsc0gpyRD cW3Om+0hC57wibZ1uxvmMF2GUA== X-Google-Smtp-Source: ABdhPJwtVh136lgM0X9csLv5NUApWFhnsNXK8mNRlm8j5H8xDibaKO/deAYvHrFWFfTduSB63RTtJg== X-Received: by 2002:a65:6208:: with SMTP id d8mr4122392pgv.365.1614278029238; Thu, 25 Feb 2021 10:33:49 -0800 (PST) Received: from localhost ([2620:15c:202:1:1d8:8d0c:f75e:edd8]) by smtp.gmail.com with UTF8SMTPSA id w202sm7243812pff.198.2021.02.25.10.33.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Feb 2021 10:33:48 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: devicetree@vger.kernel.org, Douglas Anderson , linux-arm-msm@vger.kernel.org, Stephen Boyd , linux-kernel@vger.kernel.org, Matthias Kaehlcke , Antony Wang Subject: [PATCH v2 3/4] arm64: dts: qcom: sc7180: trogdor: Fix trip point config of charger thermal zone Date: Thu, 25 Feb 2021 10:33:36 -0800 Message-Id: <20210225103330.v2.3.Ife7768b6b4765026c9d233ad4982da0e365ddbca@changeid> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog In-Reply-To: <20210225103330.v2.1.I6a426324db3d98d6cfae8adf2598831bb30bba74@changeid> References: <20210225103330.v2.1.I6a426324db3d98d6cfae8adf2598831bb30bba74@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The trip point configuration of the charger thermal zone for trogdor is missing a node for the critical trip point. Add the missing node. Fixes: bb06eb3607e9 ("arm64: qcom: sc7180: trogdor: Add ADC nodes and thermal zone for charger thermistor") Signed-off-by: Matthias Kaehlcke Reviewed-by: Stephen Boyd Reviewed-by: Douglas Anderson --- Changes in v2: - patch added to the series arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index bda983da4eaf..ab4efaece5cb 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -22,9 +22,11 @@ charger_thermal: charger-thermal { thermal-sensors = <&pm6150_adc_tm 1>; trips { - temperature = <125000>; - hysteresis = <1000>; - type = "critical"; + charger-crit { + temperature = <125000>; + hysteresis = <1000>; + type = "critical"; + }; }; }; }; From patchwork Thu Feb 25 18:33:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 387282 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF532C4332E for ; Thu, 25 Feb 2021 18:36:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96E0B64E6C for ; Thu, 25 Feb 2021 18:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233397AbhBYSg3 (ORCPT ); Thu, 25 Feb 2021 13:36:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233618AbhBYSeb (ORCPT ); Thu, 25 Feb 2021 13:34:31 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A796AC0617AA for ; Thu, 25 Feb 2021 10:33:51 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id w18so3662480plc.12 for ; Thu, 25 Feb 2021 10:33:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JpUDXb+08O73zaMFvPArwT11W4r8PqHrJ9N7vVR10KU=; b=M82C3UnDP8wzdzQ+dqrcf1VmMJ8J+Mmayd4/zcdCx1c2dDyJ1zBWOL51jVynxPbMWo fnzrMrZ8arDWhM3KoXSxaep3ladV4mZDHYRopeiiGjOH8aRdbEyHTi6ITSQPWWDpcP/C jWwEtAmdI+DInbIndeW0v4hNmAz5EnTBbVvj8= 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=JpUDXb+08O73zaMFvPArwT11W4r8PqHrJ9N7vVR10KU=; b=qHj8Tm/ej3HgDO844evVWnxLC0kW3M3gTpeYbex2ak94XKeYtvWKu3SbDnJCfMriFY YMc+HgNE3z8/FdG9QUofta/Am8tOT9x7cufYULZe0CDADhFOZdrDCFeJpDzcCp23X2oH 0fq754TIUNv+dTE9nKbLUSb8+Bbdbid2wsvdS8vqlhZcwH7/FPE9gsSQq8te0DR8BUOB BNrJyT1+kc1CMsdd6IVtVicOS5vm4MfLE7gyTRy0QhS/uVU/+4lKIbWyZqjjJ+oBiRQl RK4t0QFBaT2xbyEzopH317XGgM/G/jzN06OALsn0Sopr99AlH/diUAFCKG+9WZd0eEv6 VZgA== X-Gm-Message-State: AOAM530zTva8QbXeFcPkDSXJ3OO236bK6dz6+GO0l2dgVNO2cSD8iWAt u/dIXdAjA07uOFhl/TI73HiYag== X-Google-Smtp-Source: ABdhPJwxxmKD5BkvQ0tPShEjl8xcqLMiOSez7ywyUWkxzveGyfx8EpKbj0qiKYEFiy2tHZWLk46r7w== X-Received: by 2002:a17:90b:8a:: with SMTP id bb10mr4648192pjb.207.1614278031222; Thu, 25 Feb 2021 10:33:51 -0800 (PST) Received: from localhost ([2620:15c:202:1:1d8:8d0c:f75e:edd8]) by smtp.gmail.com with UTF8SMTPSA id js2sm6581089pjb.54.2021.02.25.10.33.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Feb 2021 10:33:50 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: devicetree@vger.kernel.org, Douglas Anderson , linux-arm-msm@vger.kernel.org, Stephen Boyd , linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH v2 4/4] arm64: dts: qcom: sc7180: trogdor: Use ADC TM channel 0 instead of 1 for charger temperature Date: Thu, 25 Feb 2021 10:33:37 -0800 Message-Id: <20210225103330.v2.4.I67e29f2854bad22e3581d6a6e1879b9fc8abbdea@changeid> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog In-Reply-To: <20210225103330.v2.1.I6a426324db3d98d6cfae8adf2598831bb30bba74@changeid> References: <20210225103330.v2.1.I6a426324db3d98d6cfae8adf2598831bb30bba74@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On trogdor the ADC thermal monitor is used for monitoring certain device temperatures. All trogdor boards have at least a thermistor for the charger temperature, optionally they may have others. Currently the ADC thermal monitor is configured to use channel 1 for the charger temperature. Given that all trogdor boards have the charger thermistor it makes more sense to use channel 0, and then let boards with other thermistors use channels 1, 2, 3, rather than 0, 2, 3. Signed-off-by: Matthias Kaehlcke --- Changes in v2: - patch added to the series arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index ab4efaece5cb..58e127b6ba1e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -19,7 +19,7 @@ charger_thermal: charger-thermal { polling-delay-passive = <0>; polling-delay = <0>; - thermal-sensors = <&pm6150_adc_tm 1>; + thermal-sensors = <&pm6150_adc_tm 0>; trips { charger-crit { @@ -718,8 +718,8 @@ charger-thermistor@4f { &pm6150_adc_tm { status = "okay"; - charger-thermistor@1 { - reg = <1>; + charger-thermistor@0 { + reg = <0>; io-channels = <&pm6150_adc ADC5_AMUX_THM3_100K_PU>; qcom,ratiometric; qcom,hw-settle-time-us = <200>;