2022-07-14 07:58:28

by Jimmy Chen

Subject: [PATCH v4 2/3] arm64: dts: qcom: Add sc7280-herobrine-villager-r1.dts file for LTE sku in sc7280-villager family

This adds sc7280-herobrine-villager-r1.dts for villager device tree files.

Signed-off-by: Jimmy Chen <[email protected]>

---

Changes in v4:
-Add this patch

.../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
new file mode 100644
index 0000000000000..c03b3ae4de506
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Villager board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+
+#include "sc7280-herobrine-villager-r0.dts"
+#include "sc7280-herobrine-audio-wcd9385.dtsi"
+
+/ {
+ model = "Google Villager (rev1+)";
+ compatible = "google,villager", "qcom,sc7280";
+};
--
2.25.1

2022-07-14 15:35:53

by Doug Anderson

Subject: Re: [PATCH v4 2/3] arm64: dts: qcom: Add sc7280-herobrine-villager-r1.dts file for LTE sku in sc7280-villager family

Hi,

On Thu, Jul 14, 2022 at 12:50 AM Jimmy Chen <[email protected]> wrote:
>
> This adds sc7280-herobrine-villager-r1.dts for villager device tree files.

You could mention why -r1 is different. It would be enough to say
something like:

Herobrine-r1 is exactly the same as -r0 except that it uses a
different audio solution (it uses the same one as the CRD).


> Signed-off-by: Jimmy Chen <[email protected]>
>
> ---
>
> Changes in v4:
> -Add this patch
>
> .../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
> create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts

The ${SUBJECT} of this patch is a bit long and seems like it could be
shortened. Unless it's unavoidable I try to keep mine under 80
characters. How about just:

arm64: dts: qcom: sc7280: Add herobrine-villager-r1


> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
> new file mode 100644
> index 0000000000000..c03b3ae4de506
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Villager board device tree source
> + *
> + * Copyright 2022 Google LLC.
> + */
> +
> +#include "sc7280-herobrine-villager-r0.dts"
> +#include "sc7280-herobrine-audio-wcd9385.dtsi"
> +
> +/ {
> + model = "Google Villager (rev1+)";
> + compatible = "google,villager", "qcom,sc7280";
> +};

You should also add the -r1 dts to the Makefile in this patch.

Also as part of this patch you should change the
"sc7280-herobrine-villager-r0.dts" so that it isn't "rev0+" but is
just "rev0", AKA:

- model = "Google Villager (rev0+)";
- compatible = "google,villager", "qcom,sc7280";
+ model = "Google Villager (rev0)";
+ compatible = "google,villager-rev0", "qcom,sc7280";