Re: [PATCH] arm64: dts: qcom: sc7180: wormdingler: Add wormdingler dts files.

[Doug Anderson]

Hi,

On Wed, Apr 27, 2022 at 12:54 PM Joseph S. Barrera III
<joebar@xxxxxxxxxxxx> wrote:
>
> Wormdingler is a trogdor-based board, shipping to customers as the
> Lenovo IdeaPad Chromebook Duet 3. These dts files are copies from
> the downstream Chrome OS 5.4 kernel, but with the camera
> (sc7180-trogdor-mipi-camera.dtsi) #include removed.
>
> Signed-off-by: Joseph S. Barrera III <joebar@xxxxxxxxxxxx>
> ---

So this is the second version of the patch so it should be marked as
such. You're using patman, which means you should have something like:

Series-version: 2
Series-changes: 2
- Word wrapped patch description.
- Removed "Author" from patch description.
- Fixed whitespace around "en_pp3300_dx_edp"

Then patman will translate that in the right thing. In the next
version of the patch you'd _update_ "Series-version" to 3. Then you'd
leave the Series-changes: 2 stuff and add a new Series-changes: 3
section talking about the changes from 2 to 3. Running `patman
--full-help` should talk about all this stuff.

As a nit, I'll also mention that your subject line for the patch
shouldn't end with a period.


>  arch/arm64/boot/dts/qcom/Makefile             |   6 +
>  .../sc7180-trogdor-wormdingler-rev0-boe.dts   |  22 +
>  .../sc7180-trogdor-wormdingler-rev0-inx.dts   |  22 +
>  .../qcom/sc7180-trogdor-wormdingler-rev0.dtsi |  53 +++
>  ...0-trogdor-wormdingler-rev1-boe-rt5682s.dts |  39 ++
>  .../sc7180-trogdor-wormdingler-rev1-boe.dts   |  28 ++
>  ...0-trogdor-wormdingler-rev1-inx-rt5682s.dts |  33 ++
>  .../sc7180-trogdor-wormdingler-rev1-inx.dts   |  22 +
>  .../dts/qcom/sc7180-trogdor-wormdingler.dtsi  | 417 ++++++++++++++++++
>  9 files changed, 642 insertions(+)
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-boe.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0-inx.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-inx.dts
>  create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index f9e6343acd03..5f51452e3dc1 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -81,6 +81,12 @@ dtb-$(CONFIG_ARCH_QCOM)      += sc7180-trogdor-pompom-r2.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-pompom-r2-lte.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-pompom-r3.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-pompom-r3-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev0-boe.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev0-inx.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev1-boe.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev1-inx.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb
> +dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-r1.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7180-trogdor-r1-lte.dtb
>  dtb-$(CONFIG_ARCH_QCOM)        += sc7280-herobrine-herobrine-r0.dtb

sc7280-herobrine-herobrine-r0.dtb has been removed from the Qualcomm
tree. This makes your patch not apply unless I do "git am -3". Can you
update the Qualcomm branch, rebase, and send a v3?


> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
> new file mode 100644
> index 000000000000..1a921a540075
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Wormdingler board device tree source
> + *
> + * Copyright 2021 Google LLC.
> + *
> + * SKU: 0x401 => 1025
> + *  - bits 11..8: Panel ID: 0x4 (BOE)
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7180-trogdor-wormdingler.dtsi"

Hrm, looking at these rt5682s.dts files it feels like it could be done
a little better. It would probably be slightly better/shorter to base
on the non-rt5682s version, AKA:

#include "sc7180-trogdor-wormdingler-rev1-boe.dts"

/ {
  model = "Google Wormdingler rev1+ (BOE, rt5682s)";
  compatible = "google,wormdingler-sku1025", "qcom,sc7180";
};

&alc5682 {
  compatible = "realtek,rt5682s";
  realtek,dmic1-clk-pin = <2>;
  realtek,dmic-clk-rate-hz = <2048000>;
};

&sound {
  compatible = "google,sc7180-trogdor";
  model = "sc7180-rt5682s-max98357a-1mic";
};

...similar for the other -rt5682s file...

Not sure why I didn't suggest that originally when reviewing
downstream at <https://crrev.com/c/3305627>. I guess I was younger
then.

It'd be nice if you could do this in a v3, though I suppose we could
always do it as a future cleanup.

It would also be handy if you could delete the keypad num-rows /
num-columns in wormdingler.dts in a v3 like Stephen did for
coachz/homestar. That'll save us from having to do a separate patch
for it. Buttons/switches won't work until we get the input fix in
linux-next, but that shouldn't be a huge deal, especially since
wormdinger wasn't even supported upstream at all until this patch.

[1] https://lore.kernel.org/r/20220426225748.324759-1-swboyd@xxxxxxxxxxxx

-Doug