From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.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 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 142FAC433E6 for ; Fri, 5 Mar 2021 18:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA93F650AD for ; Fri, 5 Mar 2021 18:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229651AbhCEStA (ORCPT ); Fri, 5 Mar 2021 13:49:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbhCESsa (ORCPT ); Fri, 5 Mar 2021 13:48:30 -0500 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB4F2C061756 for ; Fri, 5 Mar 2021 10:48:30 -0800 (PST) Received: by mail-qt1-x82f.google.com with SMTP id o1so2492144qta.13 for ; Fri, 05 Mar 2021 10:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+lW0O727rhlk3/EmX1NxZE3NA/fIKhpZMCBiUvxp/JM=; b=X2eizvrPuMXNHR9aaeDDlQSEk/VqDe+9QFlhTPm1n5ug8099MCdnK57mRh2NWtZdel 09GnXXoBZWzt4cvd/Iyb5bbh+AjX5LT0UGhtewuNMbdZAlfHKlwkGvytXnaFLaE9YxGV /jHqz4Q6Wb5c/BO1508xAEmJQik5n8tURj08A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+lW0O727rhlk3/EmX1NxZE3NA/fIKhpZMCBiUvxp/JM=; b=kOAIAs4WxFZMDz2wUM3EhYb8duYNsWXG8IdOOcAoYp8GGt4UXvG4izA7Jfa6gCMeX4 XAYP2ENeYB8bBThE9HQzEITLkbDBJzNl0jyftFLuzpmn2A43Bx8kayeNnv105DVJ7vkK 5fdzYBRrzJsClmMwbyTIAjhWV42gdORgXGw07G8tHFnQkcRE/RJ88L1PAZWRVlYLkx6C CxA8EJ7jqq/z0P53Ir6oXFpr0aZHNUu5RMnRKkywxvFiaHeDwovm3onVLhvJswmHZyu0 6RCltAUkPV2EVfH3XvHP+fPbErKXyUB4RY8YYvmPsJJVC5NpPhf6lr39YjCGo8iARAhh 6PTw== X-Gm-Message-State: AOAM533R4Xnpi0I3v0oQayW1CnOTrLEJ72x2g+I8g5auJ6vGY1dr4qf4 NbkysWVXJCV4IDqlfgcVEL2wpjtMOqpMoQ== X-Google-Smtp-Source: ABdhPJywVNWRvRkF8NyebfSuPaU4ZuxSH5T1s4m0wJArCM1tDb7CL2+CfoY6gGTUyLjJ1eQd105/ww== X-Received: by 2002:ac8:4a91:: with SMTP id l17mr10231199qtq.80.1614970109517; Fri, 05 Mar 2021 10:48:29 -0800 (PST) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com. [209.85.219.170]) by smtp.gmail.com with ESMTPSA id z24sm2288799qkz.65.2021.03.05.10.48.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Mar 2021 10:48:28 -0800 (PST) Received: by mail-yb1-f170.google.com with SMTP id m9so2972634ybk.8 for ; Fri, 05 Mar 2021 10:48:28 -0800 (PST) X-Received: by 2002:a25:d3c5:: with SMTP id e188mr16284311ybf.345.1614970108212; Fri, 05 Mar 2021 10:48:28 -0800 (PST) MIME-Version: 1.0 References: <20210304180415.1531430-1-mka@chromium.org> <20210304100341.2.I7fef1a0e82bd2f3c1bc35501f8652e027aae4fcc@changeid> In-Reply-To: <20210304100341.2.I7fef1a0e82bd2f3c1bc35501f8652e027aae4fcc@changeid> From: Doug Anderson Date: Fri, 5 Mar 2021 10:48:16 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/4] arm64: dts: qcom: sc7180: Add pompom rev3 To: Matthias Kaehlcke Cc: Andy Gross , Bjorn Andersson , Rob Herring , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , linux-arm-msm , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Mar 4, 2021 at 10:04 AM Matthias Kaehlcke wrote: > > 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 > + >; > +}; I don't love copying all this keymap stuff. Options I can think of: 1. Just put it in "-rev3". Have the "-rev2" dts just include the "-rev3" dts and then override the model/compatible and disable the charger_thermal. 2. Put the keyboard stuff in the "dtsi" file and then "-rev1" can have something like: /delete-node/ keyboard_controller; #include In general the preference is that the ugly device trees should get pushed down to earlier revs since (eventually) they can just be dropped. I'll also mention that I don't see a huge benefit in this being a separate patch from the next one--I'd just squash them together... -Doug