From patchwork Thu Mar 4 18:04:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 392897 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 3711EC433E9 for ; Thu, 4 Mar 2021 18:06:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 028C464F5F for ; Thu, 4 Mar 2021 18:06:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232834AbhCDSFc (ORCPT ); Thu, 4 Mar 2021 13:05:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233174AbhCDSFE (ORCPT ); Thu, 4 Mar 2021 13:05:04 -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 3C186C061760 for ; Thu, 4 Mar 2021 10:04:24 -0800 (PST) Received: by mail-pg1-x536.google.com with SMTP id t26so19418278pgv.3 for ; Thu, 04 Mar 2021 10:04:24 -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=Oy6OM68cEg7V5CVxxg9uhOr+dPYz/8IN2GN05mc+ylc=; b=inUFbrbjNM5OLobpgnWPduRc7oj5cDbyCOxg142PlFKl96NVFex9HjbG+Yb/RcGYzu Bno0/Hl1bSlpt0DXDu8kqH6qL5dZ+DUuNJEsI90dqnei/7Jl3/Vb6DQNXhqm6wNMlAzT IaSAx5I7Okt9jhXJM8iOSRMR10IySjMdJeofc= 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=Oy6OM68cEg7V5CVxxg9uhOr+dPYz/8IN2GN05mc+ylc=; b=KzYooUMFwrNDFLy9qKMjODWnauaVvkRQKmiZSTkljTPw/mbqHJ8owEtF2J0Ue8K/e9 9EAqRIDopg2A4Dop+iP0kgV9/JWhUj3k02VAeh/gTr5RZxZ1l3lqOx4mCxHtiFgNqGes +gAQJE75Z1lPRn53hBYC/rVfDG0hK/BNsW6ybugXdDy89Gf1OiTvAabnSESdAYHhCQrb lCZuBn1KfrsjupYtqCGtZXYmznXEAMq3gb8c6FcZq2wqXNhCpCVd65GqIHPSCCm/+4/0 QtJevz+bKdL8WW0icK5heKIA6Ai1Y9n+B8ZbaDERHI0X5jZlO54RfKDr2FYnPplj7eH2 8svA== X-Gm-Message-State: AOAM530P7SLEYYq/+tGJQto0N5n6/XdP11n2KwiCcqnzECSPnudiVm1d 6D6dY1lf5vXTMLQ3OYVv7n+CqQ== X-Google-Smtp-Source: ABdhPJxFj+lG+qRvTknGt/ytzhAPX+Aw+uRyvNly8A9Wc2thwBmAAl1SLPbPdz89V5u9tavbf22zHA== X-Received: by 2002:a63:ce52:: with SMTP id r18mr4643923pgi.211.1614881063700; Thu, 04 Mar 2021 10:04:23 -0800 (PST) Received: from localhost ([2620:15c:202:1:69fe:a9f8:ca53:af2b]) by smtp.gmail.com with UTF8SMTPSA id t187sm76558pfb.91.2021.03.04.10.04.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Mar 2021 10:04:23 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 1/4] arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone Date: Thu, 4 Mar 2021 10:04:12 -0800 Message-Id: <20210304100341.1.I6d587e7ae72a5a47253bb95dfdc3158f8cc8a157@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210304180415.1531430-1-mka@chromium.org> References: <20210304180415.1531430-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Commit f73558cc83d1 ("arm64: dts: qcom: sc7180: Disable charger thermal zone for lazor") disables the charger thermal zone for specific lazor revisions due to an unsupported thermistor type. The initial idea was to disable the thermal zone for older revisions and leave it enabled for newer ones that use a supported thermistor. Finally the thermistor won't be changed on newer revisions, hence the thermal zone should be disabled for all lazor (and limozeen) revisions. Instead of disabling it per revision do it once in the shared .dtsi for lazor. 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 --------- arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 9 +++++++++ 4 files changed, 9 insertions(+), 27 deletions(-) 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 5c997cd90069..30e3e769d2b4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -14,15 +14,6 @@ / { compatible = "google,lazor-rev0", "qcom,sc7180"; }; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - &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 d9fbcc7bc5bd..c2ef06367baf 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -14,15 +14,6 @@ / { compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180"; }; -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; - &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 19e69adb9e04..1b9d2f46359e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -13,12 +13,3 @@ / { model = "Google Lazor (rev3+)"; compatible = "google,lazor", "qcom,sc7180"; }; - -/* - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is - * not supported by the PM6150 ADC driver. Disable the charger thermal zone - * to avoid using bogus temperature values. - */ -&charger_thermal { - status = "disabled"; -}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 89e5cd29ec09..aa2c4a9098db 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -58,6 +58,15 @@ ap_ts: touchscreen@10 { }; }; +/* + * Lazor is stuffed with a 47k NTC as charger thermistor which currently is + * not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +}; + /* PINCTRL - modifications to sc7180-trogdor.dtsi */ &ts_reset_l { From patchwork Thu Mar 4 18:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 392895 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 34C00C43381 for ; Thu, 4 Mar 2021 18:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB7CE601FC for ; Thu, 4 Mar 2021 18:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232955AbhCDSGE (ORCPT ); Thu, 4 Mar 2021 13:06:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232853AbhCDSFm (ORCPT ); Thu, 4 Mar 2021 13:05:42 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1A96C061764 for ; Thu, 4 Mar 2021 10:04:26 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id x24so2270854pfn.5 for ; Thu, 04 Mar 2021 10:04:26 -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=i6KaN9zbLzNpUQuVveUaLqGIfMdvHfJjzSPxZEmeLTs=; b=FvZ28nglfwSySTl0qfHNPTPX3XWeh7RvzwMdKpMVNglbCiuiu3yZQK6aUB+s31c9uP lEMdeiYHvcxN1iinwlWRgmie/nqKOxeiX7Gqe51m9czFv8mWFvH3aAivgNoF/ON/u/Nn Ahmgxxe3VHbZB08d+1v+zSqBC/BQfUlC5aS9o= 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=i6KaN9zbLzNpUQuVveUaLqGIfMdvHfJjzSPxZEmeLTs=; b=CIpe+d53YozmocpdndMBFHwmvVUDi76T2N6ChUc2x9cRjE5gVLzMi5q0VtqiEUctrg Ag2c7FZucz+TAzrCFlOHZwILzu1LFVHrDd2NCeCQIYLegLab0w1ckfjDjNdV/RYiRVFV ywHnQwqqi5dZhdnpnH/0jZFSc7XpYbd6jO3q+OBGusSc3J6w+LMXXk7X60ZtYd6pFebw QWn5j2MIyUXStThj4c5SUKi33rZNleR72nMSzV8qmo6nU3IivH4yutQvX2dMoPoTWa13 sp9ecifeejljsxJIOHor6DryfwyZszBQoBbdrrMdPa1NmjKiapZG7HH1/wlrv1TIrLRM AjxQ== X-Gm-Message-State: AOAM532wV0esU8AtZ3M2EbdAoPtLSLS4WaQU81KZ6c8mGHWbLvWF39Xy Hq9nVSDWRrHZBUA8JSPiEuYNlA== X-Google-Smtp-Source: ABdhPJzbyIQnz9X8WG1yUzbD+tZZn9lIS9S0KdW44tucV9eijEWYAr84bAdQ3OJrUH6+L+kwv8KbXA== X-Received: by 2002:a63:1d45:: with SMTP id d5mr4645310pgm.52.1614881066476; Thu, 04 Mar 2021 10:04:26 -0800 (PST) Received: from localhost ([2620:15c:202:1:69fe:a9f8:ca53:af2b]) by smtp.gmail.com with UTF8SMTPSA id d6sm71426pfq.109.2021.03.04.10.04.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Mar 2021 10:04:26 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 2/4] arm64: dts: qcom: sc7180: Add pompom rev3 Date: Thu, 4 Mar 2021 10:04:13 -0800 Message-Id: <20210304100341.2.I7fef1a0e82bd2f3c1bc35501f8652e027aae4fcc@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210304180415.1531430-1-mka@chromium.org> References: <20210304180415.1531430-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The only kernel visible change with respect to rev2 is that pompom rev3 changed the charger thermistor from a 47k to a 100k NTC to use a thermistor which is supported by the PM6150 ADC driver. Signed-off-by: Matthias Kaehlcke --- .../dts/qcom/sc7180-trogdor-pompom-r2-lte.dts | 4 +- .../dts/qcom/sc7180-trogdor-pompom-r2.dts | 4 +- .../dts/qcom/sc7180-trogdor-pompom-r3-lte.dts | 14 ++++++ .../dts/qcom/sc7180-trogdor-pompom-r3.dts | 46 +++++++++++++++++++ 4 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts index 791d496ad046..00e187c08eb9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2-lte.dts @@ -9,6 +9,6 @@ #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Pompom (rev2+) with LTE"; - compatible = "google,pompom-sku0", "qcom,sc7180"; + model = "Google Pompom (rev2) with LTE"; + compatible = "google,pompom-rev2-sku0", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts index 984d7337da78..2b2bd906321d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts @@ -10,8 +10,8 @@ #include "sc7180-trogdor-pompom.dtsi" / { - model = "Google Pompom (rev2+)"; - compatible = "google,pompom", "qcom,sc7180"; + model = "Google Pompom (rev2)"; + compatible = "google,pompom-rev2", "qcom,sc7180"; }; &keyboard_controller { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts new file mode 100644 index 000000000000..067cb75a011e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2020 Google LLC. + */ + +#include "sc7180-trogdor-pompom-r3.dts" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Pompom (rev3+) with LTE"; + compatible = "google,pompom-sku0", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts new file mode 100644 index 000000000000..12d2d1e8e9e1 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r3.dts @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Pompom board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180-trogdor-pompom.dtsi" + +/ { + model = "Google Pompom (rev3+)"; + compatible = "google,pompom", "qcom,sc7180"; +}; + +&keyboard_controller { + function-row-physmap = < + MATRIX_KEY(0x00, 0x02, 0) /* T1 */ + MATRIX_KEY(0x03, 0x02, 0) /* T2 */ + MATRIX_KEY(0x02, 0x02, 0) /* T3 */ + MATRIX_KEY(0x01, 0x02, 0) /* T4 */ + MATRIX_KEY(0x03, 0x04, 0) /* T5 */ + MATRIX_KEY(0x02, 0x04, 0) /* T6 */ + MATRIX_KEY(0x01, 0x04, 0) /* T7 */ + MATRIX_KEY(0x02, 0x09, 0) /* T8 */ + MATRIX_KEY(0x01, 0x09, 0) /* T9 */ + MATRIX_KEY(0x00, 0x04, 0) /* T10 */ + >; + linux,keymap = < + MATRIX_KEY(0x00, 0x02, KEY_BACK) + MATRIX_KEY(0x03, 0x02, KEY_REFRESH) + MATRIX_KEY(0x02, 0x02, KEY_ZOOM) + MATRIX_KEY(0x01, 0x02, KEY_SCALE) + MATRIX_KEY(0x03, 0x04, KEY_SYSRQ) + MATRIX_KEY(0x02, 0x04, KEY_BRIGHTNESSDOWN) + MATRIX_KEY(0x01, 0x04, KEY_BRIGHTNESSUP) + MATRIX_KEY(0x02, 0x09, KEY_MUTE) + MATRIX_KEY(0x01, 0x09, KEY_VOLUMEDOWN) + MATRIX_KEY(0x00, 0x04, KEY_VOLUMEUP) + + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* LOCK key */ + + CROS_STD_MAIN_KEYMAP + >; +}; From patchwork Thu Mar 4 18:04:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 393774 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 D8793C433DB for ; Thu, 4 Mar 2021 18:06:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95804601FC for ; Thu, 4 Mar 2021 18:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232903AbhCDSGF (ORCPT ); Thu, 4 Mar 2021 13:06:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232911AbhCDSFm (ORCPT ); Thu, 4 Mar 2021 13:05:42 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 672C9C0613D8 for ; Thu, 4 Mar 2021 10:04:30 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id kx1so1263449pjb.3 for ; Thu, 04 Mar 2021 10:04:30 -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=7NL7Y/1snwKGBiV/s0r4gaXgxf3olaiDdxdhFVYX9Hk=; b=MMCreVH+kcPeiQC0v5Sf+NUgzZepGQS7mPYJpHPOYsWFNrtE7WTBQhwLBcab5Hf8Tg H5Oh0LJgY6fz7wkAJN9eIaLer8U7WXkersF8uATP+NNv8ZS86QRSLTyoOzAaJqYSjvmx 6tj3WMonYL4QDtlwU9+rCEzd+wM3pCgQXaDMo= 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=7NL7Y/1snwKGBiV/s0r4gaXgxf3olaiDdxdhFVYX9Hk=; b=cpy2B/dPBmWGA7geiaHOmRR3WcAklQpQ4mMKCMOOp/w/yBAd5Hc26cchjqIHwz5geQ gnN6RUPUBztfKfAn7FaEw394Acyo8BJBzdHyqyEk6C12UaHa91VDxIkonZPdPQKfVrqH IyNBSxtjkoa7F3P3E5AYDOTnI8V2bc6XLVY5HIxoDyfmuJnylNrxJy6KOLrCFIRZRmxB 2ZJRzYgInYizjhF71D9gyvKjoGQqAkTAkNhEgFHs1XrmJcdz6DYH6sJLZNOk1oWB+35K kyl40pcThIOgI8mT7KQQ5AUWyfNHIXGqTUay7xF1gb6iYNv7Ti6e02Szan4BRrWQSnbk j9hQ== X-Gm-Message-State: AOAM532ZLUr42nmNgmTsdR6Z5Xme00jBetDv6djkKPoRE3zVkA4BOhvM ov4oUh8fup0bNHHOkXkluSmTNA== X-Google-Smtp-Source: ABdhPJzM9tJ/NPdmkUEQUMkwwpvYOohTbrotYFCkxpiThMe4UHc4EGDnYHfMaZE0tABhBYhN+XxhMA== X-Received: by 2002:a17:90a:bc06:: with SMTP id w6mr5648346pjr.44.1614881069998; Thu, 04 Mar 2021 10:04:29 -0800 (PST) Received: from localhost ([2620:15c:202:1:69fe:a9f8:ca53:af2b]) by smtp.gmail.com with UTF8SMTPSA id b22sm89045pfo.23.2021.03.04.10.04.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Mar 2021 10:04:29 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 3/4] arm64: dts: qcom: sc7180: pompom: Disable charger thermal zone for rev1 and rev2 Date: Thu, 4 Mar 2021 10:04:14 -0800 Message-Id: <20210304100341.3.I4138c3edee23d1efa637eef51e841d9d2e266659@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210304180415.1531430-1-mka@chromium.org> References: <20210304180415.1531430-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Pompom rev1 and rev2 are stuffed with a 47k NTC as thermistor for the charger temperature which currently isn't supported by the PM6150 ADC driver. Disable the charger thermal zone to avoid the use of bogus temperature values. Signed-off-by: Matthias Kaehlcke --- arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 9 +++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts index e720e7bd0d70..bc6574e446a9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r1.dts @@ -14,6 +14,15 @@ / { compatible = "google,pompom-rev1", "qcom,sc7180"; }; +/* + * Pompom rev1 is stuffed with a 47k NTC as charger thermistor which currently + * is not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +}; + &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-pompom-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts index 2b2bd906321d..779c90ed35e4 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom-r2.dts @@ -14,6 +14,15 @@ / { compatible = "google,pompom-rev2", "qcom,sc7180"; }; +/* + * Pompom rev2 is stuffed with a 47k NTC as charger thermistor which currently + * is not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +}; + &keyboard_controller { function-row-physmap = < MATRIX_KEY(0x00, 0x02, 0) /* T1 */ From patchwork Thu Mar 4 18:04:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 393773 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 82C13C4332B for ; Thu, 4 Mar 2021 18:06:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A3C964F5F for ; Thu, 4 Mar 2021 18:06:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232911AbhCDSGF (ORCPT ); Thu, 4 Mar 2021 13:06:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232932AbhCDSFo (ORCPT ); Thu, 4 Mar 2021 13:05:44 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C397C0613DB for ; Thu, 4 Mar 2021 10:04:32 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id w18so19501082pfu.9 for ; Thu, 04 Mar 2021 10:04:32 -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=bP6h4jaGCKzDr1wOBYS4+X9av0wf+oSnSRtoXz7PDLE=; b=YGQMfD9hxLCbXep7E1Cu3JBBGm5eqFAOcphkbIXYPlcttRTvh317a65aaShNUWQQ69 6h21+uzs8yNzMdhwp8Qr6RPwOgCNCZEbe4oPPV3AC7FTysBPYmELwqwslfe2Feg2JMFV E5KEmcXUDSILiW939SWWrSbQO3mVc35d2AIE8= 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=bP6h4jaGCKzDr1wOBYS4+X9av0wf+oSnSRtoXz7PDLE=; b=ZNIrT5P3xvfZt5DY9NqXw8UdXuVqohqfUb+OJ8excqyHX6qUVyE2QKQZKiQAbQH0VJ GMA1cUaUDDM8AYomCXgB0qtLXmDot45b5TF3nI2sP3JqAlennQ/u00Zq1xvzoViuV8+r knWMEN4AXT8rDrfhtVTJq3mJsrfeLAlg4QWZntuE9w7TtNtppFDT+yjSwA2vc59KRMwd zfgzm8FBKz5/UfzkOQDqfa6knMW2w+NcoypTY+P24IV3pu8cqA5wqX3itSyBF+ZdOOT9 0wcGf1ijatAvkK2QfgFOsQU/OcSPbSgoyIu4rUyRmCMKysPcESIumJUkMdRXyLGTLPdB XspA== X-Gm-Message-State: AOAM532fcb/ev/OKbQf2qT1hiT9i5FUrVHPWnXH+pHMNaW/6MJH9dtRV VftESaZA4+Gjn//VD3qBQXp2Fw== X-Google-Smtp-Source: ABdhPJxpFJ7F13e8lsFYoJ817KdQcTW9k3UVpySLVh1qY0Ya6oqkKHgJD/x4gxpQ0Hft1DZEPnbAwg== X-Received: by 2002:a63:dc57:: with SMTP id f23mr4678332pgj.276.1614881072096; Thu, 04 Mar 2021 10:04:32 -0800 (PST) Received: from localhost ([2620:15c:202:1:69fe:a9f8:ca53:af2b]) by smtp.gmail.com with UTF8SMTPSA id w8sm107260pgk.46.2021.03.04.10.04.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Mar 2021 10:04:31 -0800 (PST) From: Matthias Kaehlcke To: Andy Gross , Bjorn Andersson , Rob Herring Cc: Douglas Anderson , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH 4/4] arm64: dts: qcom: sc7180: Disable charger thermal zone for coachz rev1 and rev2 Date: Thu, 4 Mar 2021 10:04:15 -0800 Message-Id: <20210304100341.4.I95b8a63103b77cab6a7cf9c150f0541db57fda98@changeid> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog In-Reply-To: <20210304180415.1531430-1-mka@chromium.org> References: <20210304180415.1531430-1-mka@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org CoachZ rev1 and rev2 are stuffed with a 47k NTC as thermistor for the charger temperature which currently isn't supported by the PM6150 ADC driver. Disable the charger thermal zone to avoid the use of bogus temperature values. Signed-off-by: Matthias Kaehlcke --- arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 9 +++++++++ arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts index 86619f6c1134..c6b078e70d31 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts @@ -14,6 +14,15 @@ / { compatible = "google,coachz-rev1", "qcom,sc7180"; }; +/* + * CoachZ rev1 is stuffed with a 47k NTC as charger thermistor which currently + * is not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +}; + &tlmm { gpio-line-names = "HUB_RST_L", "AP_RAM_ID0", diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts index 4f69b6ba299f..67c31795a566 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r2.dts @@ -13,3 +13,12 @@ / { model = "Google CoachZ (rev2+)"; compatible = "google,coachz", "qcom,sc7180"; }; + +/* + * CoachZ rev2 is stuffed with a 47k NTC as charger thermistor which currently + * is not supported by the PM6150 ADC driver. Disable the charger thermal zone + * to avoid using bogus temperature values. + */ +&charger_thermal { + status = "disabled"; +};