Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Jimmy Chen <jinghung.chen3@hotmail.com>
To:     LKML <linux-kernel@vger.kernel.org>, Andy Gross <agross@kernel.org>
Cc:     Alan Huang <alan-huang@quanta.corp-partner.google.com>,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        Rob Herring <robh+dt@kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Douglas Anderson <dianders@chromium.org>,
        devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH v5 2/3] arm64: dts: qcom: sc7280: Add herobrine-villager-r1
Date:   Fri, 15 Jul 2022 16:44:41 +0800
Message-ID: <SG2PR03MB5006D3E109835FCAD1B01A47CC8B9@SG2PR03MB5006.apcprd03.prod.outlook.com>
In-Reply-To: <20220715084442.115021-1-jinghung.chen3@hotmail.com>
References: <20220715084442.115021-1-jinghung.chen3@hotmail.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 6548d85e-ddf1-4378-4e7f-08da663e4fed
X-MS-TrafficTypeDiagnostic: TY2PR03MB3421:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: GxzRNidMKY0d6WhCOkFHtUxIlLiSfkj9w3hhBfDjBs2+kZW82ARv8ZkJUjYJavno4U2+PL+J8ksZryOsw8oOhRkjhwlQAMEGAlrzjHndK6R4jKLmreHLnXAdiOSQybhOwTJVmutO9u6Ewt+rGBsZSou+yM872l8Me+UeqFqwHcL7p6oQrAFp8rzvH9pAyaCGl4Ry7oj7KwdnfU1lReaIgoSoYogNgCyvwh+likjifOU19woEHhi4sfBmTGzKDaVIaL98MAD4TwJi2K+Bxwj6+FgEu9ENwidoGxIN62OQqAz2deeDHcM6oSPxNZhkbML/NG1zwDB3J5hER13594A2Er/tRitrRD+wr+k6JuV7bEBI/ysa6J7mNu/qWRSIrB6TK/XGfERHV795q+JKKAeYUtG2ZhH7DLWerqYxnWFtDtcP5OoINyp3K3ZbzG41pqcavpFGCguH/gHjcTPQMTQ4yB5Jsf1snx2+UnUCKLc55MIZMHhxSuR4OiivnRXiwU6HuWD8oGfu8adc1atyWni/O884PL1pkE+uhj9tr591vmfp5jSiBUHDNR9iznjloZe91Z2CPtDhhyHsaegrDvkz+KDQlZtq6rQ12xk1swTgIOEd28ehGUfFwDhx1ZLzstwJLPbLbDlSUZ4+2HVSLWe0hzsvj+edzrZdO7ZVWPSWDrmT2ysE/OAONBwrulAFgfZVt+F27/ynwV64sKHcGv26Sw==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FpW/niVj+Z1wlmIzPTJ5sflzjOhnKnfhKd5BPNvkffUB722/MVRceWD48wQj?=
 =?us-ascii?Q?o8wHVB/upW55dqJzj3T0GPWhKcXPhk8tfZu5+ZIi6Eror1nOfgBrx9jBn5le?=
 =?us-ascii?Q?IAtu/Mx3fDiLfDL0Agna+LAvbqmo5rOPnodmuMa6P3kDpJ6zWnjbmC1bCP4l?=
 =?us-ascii?Q?dW03X6B+R8Vd3uoM54Halg4O2CuGSk66j3IPLCYY5kWzYm3RCgxwrTmnxl4f?=
 =?us-ascii?Q?sS5nxM9T7Folotf6yCcLZkKXCfkyvfqMYHBLh8e66WLaNjL4Rm2135bUourk?=
 =?us-ascii?Q?HhwSAmIDT8QGZfqD6hFuUqkH52F9CA3yThzGAqgxnlhXKTriOkG7es8f3z1k?=
 =?us-ascii?Q?e9C0p1u6RqHTwGZf5dKj+xQP+TUzkZx08fSdDA06ArNo3K+/r3gJY3Maa6KP?=
 =?us-ascii?Q?VeGZrLcJYwzAtJiHU6VPpXMu+LVo7Et7kuvoPZDUfTg0QXDWZb+1QStgKV4O?=
 =?us-ascii?Q?b65WDMwJM3ski1IXDzAoD1rYmxYcY/bvqL+EfZUAPLDMgX7X9B9FXtndtOJC?=
 =?us-ascii?Q?ERSOlo4hpLIdLt4/56p+dxkz52PrG9v7AzxSSMy9KzhjGD9vefpgJMRB87A5?=
 =?us-ascii?Q?Y+dFmgX0IqVEy3iZjOZbQ9s0WxPDP9n0jjetK5QniLKp+rw8wYPNPbviLZrH?=
 =?us-ascii?Q?UODdJ/d07jnTLBt1Q/SXjPa4UY/FDqW1rQRccbKIA/aSXrQ7CCLr73ZBxSVk?=
 =?us-ascii?Q?++WkeFv3TNnMFNkaV4oz7vtosNSC0FKxLdNhH2W9rJjxzgq4SPXiZT6wOdfY?=
 =?us-ascii?Q?zGifHgc3DPg2/xXwo4RIcE6yBY+PapNA9fTO4vquH2kO81sFNO3ORvI4D4tX?=
 =?us-ascii?Q?qRHayNIDJcKs23p0eukQi8ANiQJ5Ea3wdXGmQhwevt62WnSPr2mGkGoJWDHk?=
 =?us-ascii?Q?PPwM+XchcsRzLbmLDZEUKBdrqgSBb3uDqBGB1YXHiQV9a+MB2JbcL/vk3eS5?=
 =?us-ascii?Q?H3qfKoaLy2ZOW1+hMDI7S5QFxQxhqM6Y7q8/n3TvyeN+C9j4jYLwBVD+ggxt?=
 =?us-ascii?Q?m0+CFw6gycZWIwwT2yMLBN2t2xWp2bPfSqb+cMh6/tpIphtQue8XNarsN+rp?=
 =?us-ascii?Q?146dM17SkSZ/BeFY3iqUzYwLc86fVEovUoxaT5BV8tgAbfNUAzzMPbdGAh4p?=
 =?us-ascii?Q?eAkgMkN7joDfHFyQhW33VEt2EWR8v8TCjbBq0IOXqdNHr0NMF6LRN0RXlDRZ?=
 =?us-ascii?Q?aMkfBiuAPogGdZiD6N22uRgWNbDMUvY+Z2EB19716hZXXqN4IUDVQCAFeCVJ?=
 =?us-ascii?Q?e96e4yiZV7IhHpVvgoUVYMnBn1WssErJyqQ40xIwdb09Lzu0PkHSQLzSG7oC?=
 =?us-ascii?Q?jfI=3D?=
X-OriginatorOrg: sct-15-20-4734-24-msonline-outlook-c0b75.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 6548d85e-ddf1-4378-4e7f-08da663e4fed
X-MS-Exchange-CrossTenant-AuthSource: SG2PR03MB5006.apcprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 08:45:04.3335
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR03MB3421
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,
        FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---

Changes in v5:
-Revise rev0+ to rev0
-Add -r1 line to the Makefile

Changes in v4:
-Add this patch

 arch/arm64/boot/dts/qcom/Makefile                  |  1 +
 .../boot/dts/qcom/sc7280-herobrine-villager-r0.dts |  4 ++--
 .../boot/dts/qcom/sc7280-herobrine-villager-r1.dts | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 9e2a13d75f9de..7e6a4d7ef3266 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sc7180-trogdor-r1-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-crd.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-herobrine-r1.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-villager-r0.dtb
+dtb-$(CONFIG_ARCG_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 2cacafd8faa8d..cbd8a2d1ef2a7 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 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