Hi,
On Tue, Sep 27, 2022 at 4:25 AM Sheng-Liang Pan
<sheng-liang.pan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:
>
> evoker have wifi/lte sku, add different dts for each sku.
>
> Signed-off-by: Sheng-Liang Pan <sheng-liang.pan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> ---
>
> Changes in v4:
> - remove change for trackpad and touchscreen
>
> arch/arm64/boot/dts/qcom/Makefile | 3 ++-
> .../boot/dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++++++
> .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 15 +++++++++++++++
> ...evoker-r0.dts => sc7280-herobrine-evoker.dtsi} | 8 --------
> 4 files changed, 31 insertions(+), 9 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
> rename arch/arm64/boot/dts/qcom/{sc7280-herobrine-evoker-r0.dts => sc7280-herobrine-evoker.dtsi} (98%)
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index d7669a7cee9f7..76390301a76c0 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -104,7 +104,8 @@ 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-crd.dtb
> -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-r0.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
> new file mode 100644
> index 0000000000000..3af9224a7492e
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Evoker board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +
> +#include "sc7280-herobrine-evoker.dts"
> +#include "sc7280-herobrine-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Evoker with LTE";
> + compatible = "google,evoker-sku512", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
> new file mode 100644
> index 0000000000000..dcdd4eecfe670
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Evoker board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7280-herobrine-evoker.dtsi"
> +
> +/ {
> + model = "Google Evoker";
> + compatible = "google,evoker", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
> similarity index 98%
> rename from arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts
> rename to arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
> index ccbe50b6249ab..1b2ec95a289e9 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
> @@ -5,15 +5,8 @@
> * Copyright 2022 Google LLC.
> */
>
> -/dts-v1/;
> -
> #include "sc7280-herobrine.dtsi"
>
> -/ {
> - model = "Google Evoker";
> - compatible = "google,evoker", "qcom,sc7280";
> -};
> -
> /*
> * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES
> *
> @@ -60,7 +53,6 @@ ap_ts: touchscreen@10 {
> interrupts = <55 IRQ_TYPE_LEVEL_LOW>;
>
> reset-gpios = <&tlmm 54 GPIO_ACTIVE_LOW>;
> -
> vcc33-supply = <&ts_avdd>;
The above is an unrelated whitespace change and doesn't belong in this
patch. Ideally you'd send a v5 where you didn't have that.
In any case, it's not a huge deal to me, so with or without that fix:
Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
If you do decide to send a v5, please make sure you carry my and
Krzysztof's Reviewed-by tags on the bindings and my Reviewed-by tag on
this patch. Thanks!
