From patchwork Sat Feb 20 02:10:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 385586 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 803D3C433E0 for ; Sat, 20 Feb 2021 02:11:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54DE664EE1 for ; Sat, 20 Feb 2021 02:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbhBTCLp (ORCPT ); Fri, 19 Feb 2021 21:11:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229919AbhBTCLo (ORCPT ); Fri, 19 Feb 2021 21:11:44 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E7D8C061786 for ; Fri, 19 Feb 2021 18:11:04 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id u11so4345354plg.13 for ; Fri, 19 Feb 2021 18:11:04 -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:mime-version :content-transfer-encoding; bh=Kz6IopIPbcKegxk7pxHBFBiJ3hU9UnYL+1DPCwmH8Mo=; b=P3lSmLt8HngZ+3yjCcpnAzz/RG8YFWspzGksrlG90QAm7M33mLzMsmWeDZXIDWfksW l5TNk85AlIHMaglnxvq3H/J6VV43wPQWa5/IV1j+Cktev2xcqaYbTKJhUrirIHTv/iD7 2BU7PrasYSnkOTz4gSt09oUjUjiWoAvIFgdJs= 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=Kz6IopIPbcKegxk7pxHBFBiJ3hU9UnYL+1DPCwmH8Mo=; b=O/8QyeAJsvYRqHLY1fUi5F+W8RV1Tc+UaKHR7vvlgNdmoKQ3I1plccktHvo6WXZQWJ g2L8yDTGQaHurGcJIIOSREiTejD5qmtOLbTn8nvDhg9gYNJleK5qRX+NlrNznxrLf6Qo 3W1W4kykZciV1DNusvaaTolJgakDIz/1UXLU+nORfMeaKux5D8f6ZAMbN+wUD5SXftTx Q55vW364733AgjEDSht9N6pYNIKpedj3wiJfFJYMMb+C6bvcwsberEDK9mxR7WP6ID39 HmGHejvhDniiscPzl3jJk6Wco7r6srX7rQgpiRSo1CwGlZObZRVrRgkQtV7sXtLtJwiC HEag== X-Gm-Message-State: AOAM531nMu45E3b2C/rXbqXc4WqHnvbuLL0FPEDnuAbVY8UCJYWgJhyk ApP0FshfpSQA4DTF/+CrGKHozQ== X-Google-Smtp-Source: ABdhPJy2kKitraZ83bpPHSUsF7kCyeLVjEnR71pgsqs7ZE9I7c4PK+mr2ngxgbttJMS7Q7wwczwTwQ== X-Received: by 2002:a17:90a:3d47:: with SMTP id o7mr11866073pjf.149.1613787063887; Fri, 19 Feb 2021 18:11:03 -0800 (PST) Received: from localhost ([2620:15c:202:1:bdfd:8eaf:bd48:f73e]) by smtp.gmail.com with UTF8SMTPSA id 203sm4608708pfy.105.2021.02.19.18.11.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Feb 2021 18:11:03 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , devicetree@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 1/3] arm64: dts: qcom: sc7180: Add lazor rev4 Date: Fri, 19 Feb 2021 18:10:57 -0800 Message-Id: <20210219181032.1.I23e12818c4a841ba9c37c60b3ba8cfeeb048285f@changeid> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Lazor rev3 and older are stuffed with a 47k NTC thermistor for the charger temperature which currently isn't supported by the PM6150 ADC driver. A supported thermistor is used in rev4 and later revisions. Add rev4 .dts files to be able to account for this. Signed-off-by: Matthias Kaehlcke --- arch/arm64/boot/dts/qcom/Makefile | 3 ++ .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 4 +-- .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 4 +-- .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 4 +-- .../dts/qcom/sc7180-trogdor-lazor-r4-kb.dts | 20 +++++++++++++ .../dts/qcom/sc7180-trogdor-lazor-r4-lte.dts | 28 +++++++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor-r4.dts | 16 +++++++++++ 7 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-kb.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 549a7a2151d4..8a8ebca07b25 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -38,6 +38,9 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-kb.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r4.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r4-kb.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r4-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts index 6985beb97e53..a578326ffbad 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts @@ -8,8 +8,8 @@ #include "sc7180-trogdor-lazor-r3.dts" / { - model = "Google Lazor (rev3+) with KB Backlight"; - compatible = "google,lazor-sku2", "qcom,sc7180"; + model = "Google Lazor (rev3) with KB Backlight"; + compatible = "google,lazor-rev3-sku2", "qcom,sc7180"; }; &keyboard_backlight { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts index 0881f8dd02c9..40169b4a48a3 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts @@ -9,8 +9,8 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor (rev3+) with LTE"; - compatible = "google,lazor-sku0", "qcom,sc7180"; + model = "Google Lazor (rev3) with LTE"; + compatible = "google,lazor-rev3-sku0", "qcom,sc7180"; }; &ap_sar_sensor { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index 1b9d2f46359e..240c3e067fac 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -10,6 +10,6 @@ #include "sc7180-trogdor-lazor.dtsi" / { - model = "Google Lazor (rev3+)"; - compatible = "google,lazor", "qcom,sc7180"; + model = "Google Lazor (rev3)"; + compatible = "google,lazor-rev3", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-kb.dts new file mode 100644 index 000000000000..e8c6d3745fed --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-kb.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" + +/ { + model = "Google Lazor (rev4+) with KB Backlight"; + compatible = "google,lazor-sku2", "qcom,sc7180"; +}; + +&keyboard_backlight { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-lte.dts new file mode 100644 index 000000000000..b260bcf85d4c --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4-lte.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor (rev4+) with LTE"; + compatible = "google,lazor-sku0", "qcom,sc7180"; +}; + +&ap_sar_sensor { + status = "okay"; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + +&keyboard_backlight { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4.dts new file mode 100644 index 000000000000..e6f4e030763e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r4.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" + +/ { + model = "Google Lazor (rev4+)"; + compatible = "google,lazor", "qcom,sc7180"; +}; From patchwork Sat Feb 20 02:10:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 385328 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 BA69FC433E0 for ; Sat, 20 Feb 2021 02:12:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8761E64E12 for ; Sat, 20 Feb 2021 02:12:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229800AbhBTCM3 (ORCPT ); Fri, 19 Feb 2021 21:12:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbhBTCMZ (ORCPT ); Fri, 19 Feb 2021 21:12:25 -0500 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 185F7C061793 for ; Fri, 19 Feb 2021 18:11:06 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id b21so6451132pgk.7 for ; Fri, 19 Feb 2021 18:11:06 -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=w1gRU/WYbri3EwXTe4FbkyvuqvAR1wAq7srUEoRk6sk=; b=hDTLFmvlhfZanu6EuAo/OJ8ZvDEKmLQm4vfPLHFJT9Lbr7+f7Z0v5NjAkFVA/zz51D 2VeVjtKcGSnOu83C4WS2B2l/h4sqeMsFrsBjzJRmzTs/OTbbLkVeAUYRBbUe3CKaBHV9 NzE/7efnv/goVjG8ADhfrqOCiUEZq115nYIBE= 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=w1gRU/WYbri3EwXTe4FbkyvuqvAR1wAq7srUEoRk6sk=; b=Ons+KBH3aXu1e8bqGrCQaiygDhX3e/I3stualtZ88TPzkxZeVVifkTRQbYik27E5or cpYqS5uPDoKk35J4rjSwuZdGUhNjO/RmlE4M5CTll3OupLWT8q2I+GRh4YnA5pY7WDTQ gAZERByPZ2c7wFWFgeonEcyu+Btph8tyoXk8m5+f69/XcKqDIRqC+C93W3qz0LaxNdE9 R3MNL76u377qJbhVHsjZZbe/4p1d1+DRmmUx+JsTeyuPe+xAiQsW5zeWhqqQcCE0kZQl UgyK8Uvebta1Bvda4PVSopbrCHDFbBXw5OV7hl2aw+LMJnzm4Uml3xvGGZ6ICBaeMS7c 8LPg== X-Gm-Message-State: AOAM5302mcoT8s6p2DNEpZpq2g2bqknGtgChYN2FO9eAgrmOQNPBCOBS FHH0nf6EBrYxLMB1mfgF2h6rpA== X-Google-Smtp-Source: ABdhPJw/LTi6lJs19ovtnX7AsyqYHx50Qrk/Z00W/+WxrCA0ZrX9WGeVEXSv7rHjGT+gSMMkbIL9dg== X-Received: by 2002:a63:bc02:: with SMTP id q2mr10938131pge.198.1613787065676; Fri, 19 Feb 2021 18:11:05 -0800 (PST) Received: from localhost ([2620:15c:202:1:bdfd:8eaf:bd48:f73e]) by smtp.gmail.com with UTF8SMTPSA id j34sm9893062pgi.62.2021.02.19.18.11.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Feb 2021 18:11:05 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , devicetree@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 2/3] arm64: dts: qcom: sc7180: trogdor: Add labels to charger thermal zone and ADC channel Date: Fri, 19 Feb 2021 18:10:58 -0800 Message-Id: <20210219181032.2.I6a426324db3d98d6cfae8adf2598831bb30bba74@changeid> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog In-Reply-To: <20210219181032.1.I23e12818c4a841ba9c37c60b3ba8cfeeb048285f@changeid> References: <20210219181032.1.I23e12818c4a841ba9c37c60b3ba8cfeeb048285f@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some revisions of trogdor boards use a thermistor for the charger temperature which currently isn't supported by the PM6150 ADC driver. Add labels for the charger thermal zone and ADC channel to allow the removal of these nodes from affected boards and avoid the use of bogus temperature values. Signed-off-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- 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 07c8b2c926c0..fa996387715b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -15,7 +15,7 @@ / { thermal-zones { - charger-thermal { + charger_thermal: charger-thermal { polling-delay-passive = <0>; polling-delay = <0>; @@ -706,7 +706,7 @@ &mdss { }; &pm6150_adc { - charger-thermistor@4f { + pm6150_adc_charger_thm: charger-thermistor@4f { reg = ; qcom,ratiometric; qcom,hw-settle-time = <200>; @@ -716,7 +716,7 @@ charger-thermistor@4f { &pm6150_adc_tm { status = "okay"; - charger-thermistor@1 { + pm6150_adc_tm_charger_thm: charger-thermistor@1 { reg = <1>; io-channels = <&pm6150_adc ADC5_AMUX_THM3_100K_PU>; qcom,ratiometric; From patchwork Sat Feb 20 02:10:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 385585 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 2127EC433E6 for ; Sat, 20 Feb 2021 02:12:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECB8D64EDF for ; Sat, 20 Feb 2021 02:12:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbhBTCMb (ORCPT ); Fri, 19 Feb 2021 21:12:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbhBTCMZ (ORCPT ); Fri, 19 Feb 2021 21:12:25 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED87DC061797 for ; Fri, 19 Feb 2021 18:11:07 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id w18so1218655plc.12 for ; Fri, 19 Feb 2021 18:11:07 -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=T/bcmgFG5Q/B+6/HjkjoWIy++Ai0witxQcUitgDw+g4=; b=eRMxvTRh3HWfGoRuMVVLNT1xvUOCKcAvZTqpYvGnv2gaTMGTWW7XKM8/Xx5WDISdR+ XKRwLK7ymE++esbSiXOycOJqCyl/poIunZtOuF25vCKgpFbb2jKdxOrMMoIxirXs84Yy Zg/GrVxZk8MHhhndLmeBx5Nvc9pSNXdCCga9c= 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=T/bcmgFG5Q/B+6/HjkjoWIy++Ai0witxQcUitgDw+g4=; b=SKXrnwNcUOAhs2m0Ird6bXeUS3iMnL6x2qREY/suvysCFFvgnLksNUycmT5fJZZ/R3 TYzutYBsTPX+X12Ej4ZaogC8cQ9hnP+AZ5luEHp2mFZVxDUWG0vnmiLDhoxFNkmirtjZ nE05xM3HldGbRZriwc0GbJd9vqB70IbpTNMPzFCAtyibysrHSBMJMe5YC5dM/sItqOR6 4w43Exa/PALNvUKrhySOJSL0MTucjb+qh9SZ5c6K0l8HxYK+Nhu34yPwqcNa5m3bumAC TAiPKbyidoW8lzWkcPRQQLiR7XM7kLK1KUAgYkkLDGbe0nSZZ/XYtCZhD0fhtxvrh2YL 2gYw== X-Gm-Message-State: AOAM533Wnz2OcZ0kYpEB0gvX7geudA66R/2oR9mjdoVYe9WKrWBP3tkp OPW409/4R9j++vW3aPYSGo4JuzitgG3FSg== X-Google-Smtp-Source: ABdhPJzP3ewmp+T7JsEUpOd4wjUq4O4buC6eZbE+P/amgOtYEdsAckKh6zEdRG95+GTHN8EfwMsXYg== X-Received: by 2002:a17:90a:ab8b:: with SMTP id n11mr11634378pjq.109.1613787067582; Fri, 19 Feb 2021 18:11:07 -0800 (PST) Received: from localhost ([2620:15c:202:1:bdfd:8eaf:bd48:f73e]) by smtp.gmail.com with UTF8SMTPSA id ca19sm749988pjb.31.2021.02.19.18.11.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Feb 2021 18:11:07 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Douglas Anderson , devicetree@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 3/3] arm64: dts: qcom: sc7180: Delete charger thermal zone and ADC channel for lazor <= rev3 Date: Fri, 19 Feb 2021 18:10:59 -0800 Message-Id: <20210219181032.3.Ia4c1022191d09fe8c56a16486b77796b83ffcae4@changeid> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog In-Reply-To: <20210219181032.1.I23e12818c4a841ba9c37c60b3ba8cfeeb048285f@changeid> References: <20210219181032.1.I23e12818c4a841ba9c37c60b3ba8cfeeb048285f@changeid> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Lazor rev3 and older are stuffed with a 47k NTC as thermistor for the charger temperature which currently isn't supported by the PM6150 ADC driver. Delete the charger thermal zone and ADC channel to avoid the use of bogus temperature values. Signed-off-by: Matthias Kaehlcke --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 9 +++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 9 +++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4..0974dbd424e1 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -14,6 +14,15 @@ / { compatible = "google,lazor-rev0", "qcom,sc7180"; }; +/* + * rev <= 3 are stuffed with a 47k NTC as charger thermistor which is currently + * not supported by the PM6150 ADC driver. Delete the thermal zone and ADC + * channel to avoid the use of bogus temperature values. + */ +/delete-node/ &charger_thermal; +/delete-node/ &pm6150_adc_charger_thm; +/delete-node/ &pm6150_adc_tm_charger_thm; + &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf..0381ca85ae97 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -14,6 +14,15 @@ / { compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; +/* + * rev <= 3 are stuffed with a 47k NTC as charger thermistor which is currently + * not supported by the PM6150 ADC driver. Delete the thermal zone and ADC + * channel to avoid the use of bogus temperature values. + */ +/delete-node/ &charger_thermal; +/delete-node/ &pm6150_adc_charger_thm; +/delete-node/ &pm6150_adc_tm_charger_thm; + &pp3300_hub { /* pp3300_l7c is used to power the USB hub */ /delete-property/regulator-always-on; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index 240c3e067fac..b9473bba8f4a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -13,3 +13,12 @@ / { model = "Google Lazor (rev3)"; compatible = "google,lazor-rev3", "qcom,sc7180"; }; + +/* + * rev <= 3 are stuffed with a 47k NTC as charger thermistor which is currently + * not supported by the PM6150 ADC driver. Delete the thermal zone and ADC + * channel to avoid the use of bogus temperature values. + */ +/delete-node/ &charger_thermal; +/delete-node/ &pm6150_adc_charger_thm; +/delete-node/ &pm6150_adc_tm_charger_thm;