Re: [PATCH v2 2/2] arm64: dts: qcom: sc7280: Add DT for sc7280-herobrine-zombie

Matthias Kaehlcke
2022-11-22T13:30:23Z

On Tue, Nov 22, 2022 at 08:37:03PM +0800, Owen Yang wrote:
> Add DT for sc7280-herobrine-zombie
>
> arch/arm64/boot/dts/qcom/Makefile
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi

Drop this

> Signed-off-by: Owen Yang <ecs.taipeikernel@gmail.com>
> ---
>
> (no changes since v1)

A diff between v1 and v2 shows that this is not correct, please provide
accurate change logs

> arch/arm64/boot/dts/qcom/Makefile | 2 +
> .../dts/qcom/sc7280-herobrine-zombie-lte.dts | 15 +
> .../boot/dts/qcom/sc7280-herobrine-zombie.dts | 16 +
> .../dts/qcom/sc7280-herobrine-zombie.dtsi | 310 ++++++++++++++++++
> 4 files changed, 343 insertions(+)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 384f2fa50646..e3226d7894ad 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -101,6 +101,8 @@ 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
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> new file mode 100644
> index 000000000000..2f1da87e5005
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-lte.dts
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +/dts-v1/;
> +
> +#include "sc7280-herobrine-zombie.dtsi"
> +#include "sc7280-herobrine-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Zombie with LTE";
> + compatible = "google,zombie-sku512", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> new file mode 100644
> index 000000000000..0246c12b2f40
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dts
> @@ -0,0 +1,16 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7280-herobrine-zombie.dtsi"
> +#include "sc7280-herobrine-wifi-sku.dtsi"
> +
> +/ {
> + model = "Google Zombie";
> + compatible = "google,zombie", "qcom,sc7280";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
> new file mode 100644
> index 000000000000..15832620ff5d
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie.dtsi
> @@ -0,0 +1,310 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Zombie board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +/dts-v1/;

This was added in v2. It isn't needed, the .dts files which include this file
already make this declaration.