aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Chen <jinghung.chen3@hotmail.com>2022-07-26 17:45:48 +0800
committerBjorn Andersson <andersson@kernel.org>2022-09-13 09:37:43 -0500
commit3accba70e2389a47f42ffb5e900d01b7960dea9e (patch)
tree63426de0a7be385cc3d84eaa3063204c17e1961c
parentdt-bindings: arm: qcom: document sc7280 and villager board (diff)
downloadlinux-dev-3accba70e2389a47f42ffb5e900d01b7960dea9e.tar.xz
linux-dev-3accba70e2389a47f42ffb5e900d01b7960dea9e.zip
arm64: dts: qcom: sc7280: Add herobrine-villager-r1
This adds sc7280-herobrine-villager-r1.dts for villager device tree files. 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 <jinghung.chen3@hotmail.com> Reviewed-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/SG2PR03MB500667CFE3F5F59585F8BA77CC949@SG2PR03MB5006.apcprd03.prod.outlook.com
-rw-r--r--arch/arm64/boot/dts/qcom/Makefile1
-rw-r--r--arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts4
-rw-r--r--arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts14
3 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index f4126f7e7640..994ce964ce98 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-r0.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
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-villager-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
index 2cacafd8faa8..cbd8a2d1ef2a 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts
@@ -10,8 +10,8 @@
#include "sc7280-herobrine.dtsi"
/ {
- model = "Google Villager (rev0+)";
- compatible = "google,villager", "qcom,sc7280";
+ model = "Google Villager (rev0)";
+ compatible = "google,villager-rev0", "qcom,sc7280";
};
/*
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 000000000000..c03b3ae4de50
--- /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";
+};