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, URIBL_BLOCKED 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 75E54C433E0 for ; Fri, 5 Mar 2021 20:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F5E0650A1 for ; Fri, 5 Mar 2021 20:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229517AbhCEUR6 (ORCPT ); Fri, 5 Mar 2021 15:17:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbhCEURd (ORCPT ); Fri, 5 Mar 2021 15:17:33 -0500 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73014C061760 for ; Fri, 5 Mar 2021 12:17:33 -0800 (PST) Received: by mail-pf1-x42c.google.com with SMTP id j12so2803980pfj.12 for ; Fri, 05 Mar 2021 12:17:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=5Ww9KevX4ecFSEP5C1OtVbh68e4J22Jsb3/WA7Lbu6o=; b=QFgkXWD8gvYD0A0l41l0VZKkI2x9X2G98Q61A7KXlguppE2aCMh1BfRJEmgtcihmd0 8f0KKbDjai78GE6vjayDXtBtY6MkIYGfjcVb23ZtcGqu45i/CLKFEiaQjuv8Dr0WXpCr RjcMRQBy77QZ7f7qYsgjMsEdNeMON9ALg3ZWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=5Ww9KevX4ecFSEP5C1OtVbh68e4J22Jsb3/WA7Lbu6o=; b=oFQCquXQVGaWLPbIJQleHIcufm2tb8GOcy6PZGyV2rqz4almBblHNH/2rmEbxyK2Cj 246xhuVssFh/DkKbGEpOmKFntO5PC8W9zJk1EWTDzLOvtNoCAkXMWxmSMYfB/6/14w5u w+s0ekdQZtlxcFXrX7JEXHSN9AoS+p3WtHRYrmf0fnoqlRD5RjI/dLSUplboWxuguXIp hiHb75XAM7qMIw/JfEpMA02K5OnB8zj7Ruz8VRJ6coLahl/bK0QHy4vyXiD5VZ07FDib SskG1dkeFtGlmSQ4YFueS9vpghM8Kb1JRNRgsQtwyg3Fglmda7sha4n/BZcYtuJpkT38 R98A== X-Gm-Message-State: AOAM530yIzFf4KCX8Bd8xFkUnAFGAAQUxAqLuST3zNqSKjZK5pwSSyCi 7HIiUp5jxcXT7gTJI0F3Ffv94Q== X-Google-Smtp-Source: ABdhPJzZUzJg4okZiTDkGXQKxjD0TxOKB5Sy6XF4xGLU25JvsLkPjWfe6wIqBxKzngAt/JiM7t/kOA== X-Received: by 2002:a63:fb11:: with SMTP id o17mr10162608pgh.282.1614975452774; Fri, 05 Mar 2021 12:17:32 -0800 (PST) Received: from localhost ([2620:15c:202:1:2878:25d1:94cb:a547]) by smtp.gmail.com with UTF8SMTPSA id h23sm3223060pfn.118.2021.03.05.12.17.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 05 Mar 2021 12:17:32 -0800 (PST) Date: Fri, 5 Mar 2021 12:17:30 -0800 From: Matthias Kaehlcke To: Doug Anderson Cc: Andy Gross , Bjorn Andersson , Rob Herring , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , linux-arm-msm , LKML Subject: Re: [PATCH 2/4] arm64: dts: qcom: sc7180: Add pompom rev3 Message-ID: References: <20210304180415.1531430-1-mka@chromium.org> <20210304100341.2.I7fef1a0e82bd2f3c1bc35501f8652e027aae4fcc@changeid> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Fri, Mar 05, 2021 at 10:48:16AM -0800, Doug Anderson wrote: > 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: agreed > 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. Thanks, I'll evaluate the options you suggested. > 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... It keeps the individual patches simpler by doing one thing at a time, but you can certainly go either way.