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>
Cc:     swboyd@chromium.org, dianders@chromium.org,
        Jimmy Chen <jinghung.chen43@yahoo.com>,
        Andy Gross <agross@kernel.org>,
        Bjorn Andersson <bjorn.andersson@linaro.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, devicetree@vger.kernel.org,
        linux-arm-msm@vger.kernel.org
Subject: [PATCH] FROMLIST: arm64: dts: qcom: Add LTE SKUs for sc7280-villager family
Date:   Thu, 30 Jun 2022 14:26:54 +0800
Message-ID: <SG2PR03MB5006F091C2016ADE8A9A208ECCBA9@SG2PR03MB5006.apcprd03.prod.outlook.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: 5be7f2e7-89a4-459a-7705-08da5a619092
X-MS-TrafficTypeDiagnostic: KL1PR03MB5538:EE_
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 9XMbLmYCBTnIYfxmU0qCHt9uy3l3tnIJNYfo8iWBC8yR21u3VpimiEToaDbKNdtZ+4PGqKr9GFbk3HiwRsH4qA2DJCq3WCDqTuTFWMdRa603JFdws+Df+hI1Ai9omgTnakZAv4Y+6gSCEFtISJOTlcstknqBOt/WWd/CSTNuoMYy6aDy2VbAd+CZEuNmt+DeIDHDuagNCZkeF7PkdhSPAB3oisyD0sxDQw4cql5UEPiNrIsfbLSKhCFzqAdmqC8HgjvxHhjOMXHzIH1S6VLRI7GTPlNzw3RfCfsDdVFaBCm3+bbHb2cloYZzI96AnYrLGJBzoZw22Yu3lIWXrvXMqVxI2p/K4BAz2kFSgEiyncIJx9q3jerzb976ud7N+Lo0V23F2/5fnS5se55gCf5u1mbqfO/n3fqoHIQ3YUgt5fMIJNT74WLL51XQalS9PYHPipNlQaYb+7SE73hmLKeZck284EBqD1rwVxYVaXnYAsMvnUYO+VQ3xuiE3+VBBhcAjWBMJVJtrQfGvJOz3s5wR9Bg3MrOWeLmrroVhV3qs2PghGZyUtIQgAJRWZRLBxGe+I1Bfbs31StY10n+FHRt+JtPueomLsbwWkimcIh3fWqM649yNSffOCdKFF6LKksHObjLEhCor/uEHog+1vxQqA==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kQBIOElOMBuQhjv2l31BJ31cxNKi/fme9COnWoMXG9u4z5XeY8ba5uzOqO/H?=
 =?us-ascii?Q?5QPMegJjgRG+LQa9QJ2mm2VE+yYNihCVFfjivb5WHobEXLFAOnVwglumVRuX?=
 =?us-ascii?Q?jtNTIAMuRpVd4k8LaGBnvdXfGMEI/Jv7qV+1ifOAPZ23kYtSbC1VthdDXvrH?=
 =?us-ascii?Q?+80O+w01nsSwy4UTOuweMb9mpNs0poTtOiyXwJzEnUL7VNRU2lgSxkZiKL5l?=
 =?us-ascii?Q?dJoXhATUUAiGk0TRKLWNbqRBKwLMxUNIl0pCq8Tv05WvR3434x0zHyQ0gIgV?=
 =?us-ascii?Q?w8KXBU6INr29dsPTuePnCs1OL/SQhuNMJMmC4R0CSCI7KM0Zne38QwEqMZYO?=
 =?us-ascii?Q?M1J3TSeEgflH4O/pHTxZLsNe8ToVyk7VeECoX/r8+1FhPXXuvHPdX+QB44Jp?=
 =?us-ascii?Q?LhYKv5Y9hnNMizfNhdoOQ1u9bgfBuOwvO9Hu0Lzc2qxEonMLbiqHMNEmcvLK?=
 =?us-ascii?Q?vTOpZyBSc7/Bla6YT+pqkyiac0QpNCizATFC2iYW3QBDekIgR6adXhQaa0qE?=
 =?us-ascii?Q?FK1D7gOCtuRIf4EsBMwKwoKVymgio74qWRtb8YqwgVJ24XxcQnISP9lxQftr?=
 =?us-ascii?Q?KbY/jmR8ewIIlZxgn2B63oWfnr++AdlqxQId5ubNU7vIZ1XOxl65SZ0JJPaq?=
 =?us-ascii?Q?bHV53PvEYrcczzgba6q09nJlTG6+KUgIFGLuAkUzhOZjqAsnak5g3HZD2+ZY?=
 =?us-ascii?Q?KgxJnDlUtvNUdu4UzGWQxvjEy+nGOUJgswlURDHc8SIXICX44pVjlKQNe4Bx?=
 =?us-ascii?Q?GY/gFfoujddbfcM3MDukgTAzs0gZLjMHmgisgB1ILTaEx3jByvFsHvGDptYf?=
 =?us-ascii?Q?UtZx3XWLwBc57yjUn9SHQdCqzLaQgvW/+sFvCYZCpDMlYkSRf0s97tA2qH4Z?=
 =?us-ascii?Q?h/BxsSBq29sSHaUjExIdKIuYFnxNa2HgHyvUPzjCmVba7gT4FVRqgLjU7cK9?=
 =?us-ascii?Q?q4yR4zrBK3XwpbLAP8kHQ04I5XbHq446YONib9t7U83upSM8xfZkNSvWCk3h?=
 =?us-ascii?Q?2UdgjgbtqsWsahsjygLAsibOEZwaB5ZuBT8L0oRXNHXV43E6MK52jXAMhsEX?=
 =?us-ascii?Q?AE84QApE1wxlbcdfBc5Ft3jYznPVTBD2sx5N3frOrcZNu/xCL53jIv96F2PU?=
 =?us-ascii?Q?eUmhEvwFNCybZLwoEAVgZbjH+vHTD22H6VHeaUtCdBlPkON3Po7Sf4zFX0cK?=
 =?us-ascii?Q?F+7zL/2OtvJW7ghBvTeuEY8r0mJ+40eiF+AkM1xpnle2TdDS3/NTI5fKF/qL?=
 =?us-ascii?Q?JtEEOMQcXWG5taa8KV5/SSvBNqv1G0/VJuCIPvMHP5eUUEHDd7r5MFSuiORE?=
 =?us-ascii?Q?CIL6NJY6DMsqTr3aHpi80ksumEfBbn00dfN6nagVWVC1Izm5aUDKZjLZetv0?=
 =?us-ascii?Q?v8fKmX8=3D?=
X-OriginatorOrg: sct-15-20-4734-24-msonline-outlook-c0b75.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 5be7f2e7-89a4-459a-7705-08da5a619092
X-MS-Exchange-CrossTenant-AuthSource: SG2PR03MB5006.apcprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 06:27:11.4879
 (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: KL1PR03MB5538
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,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE 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

From: Jimmy Chen <jinghung.chen43@yahoo.com>

This adds LTE skus for villager device tree files.

Signed-off-by: Jimmy Chen <jinghung.chen43@yahoo.com>
Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com>
---

 arch/arm64/boot/dts/qcom/Makefile                 |  3 +++
 .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi |  7 -------
 arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts |  1 +
 .../qcom/sc7280-herobrine-herobrine-r1-lte.dts    | 14 ++++++++++++++
 .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi   | 15 +++++++++++++++
 .../dts/qcom/sc7280-herobrine-villager-r0-lte.dts | 14 ++++++++++++++
 .../dts/qcom/sc7280-herobrine-villager-r1-lte.dts | 14 ++++++++++++++
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi          |  1 +
 8 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0-lte.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 2f8aec2cc6db6..ab1066883c468 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -85,7 +85,10 @@ 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-herobrine-r1.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1-lte.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sc7280-herobrine-villager-r0.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0-lte.dtb
+dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-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-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 9f4a9c263c351..b1f83ddb4e23a 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -83,13 +83,6 @@ spi_flash: flash@0 {
 	};
 };
 
-/* Modem setup is different on Chrome setups than typical Qualcomm setup */
-&remoteproc_mpss {
-	status = "okay";
-	compatible = "qcom,sc7280-mss-pil";
-	iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
-	memory-region = <&mba_mem>, <&mpss_mem>;
-};
 
 /* Increase the size from 2.5MB to 8MB */
 &rmtfs_mem {
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
index a4ac33c4fd59a..7aaba5e51af01 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
@@ -8,6 +8,7 @@
 /dts-v1/;
 
 #include "sc7280-herobrine.dtsi"
+#include "sc7280-herobrine-lte-sku.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. sc7280 CRD platform (rev5+)";
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1-lte.dts
new file mode 100644
index 0000000000000..e37773fd63b3b
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1-lte.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Herobrine board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ */
+
+#include "sc7280-herobrine-villager-r0.dts"
+#include "sc7280-herobrine-lte-sku.dtsi"
+
+/{
+	model = "Google Herobrine (rev1+) with LTE";
+	compatible = "google,herobrine-sku0", "qcom,sc7280";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
new file mode 100644
index 0000000000000..c628910b310d3
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+  /*
+   * Google Herobrine dts fragment for LTE SKUs
+   *
+   * Copyright 2022 Google LLC.
+   */
+/* Modem setup is different on Chrome setups than typical Qualcomm setup */
+&remoteproc_mpss {
+	status = "okay";
+	compatible = "qcom,sc7280-mss-pil";
+	iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
+	memory-region = <&mba_mem>, <&mpss_mem>;
+	firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
+			"qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0-lte.dts
new file mode 100644
index 0000000000000..672cb78e3088f
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0-lte.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-lte-sku.dtsi"
+
+/ {
+	model = "Google Villager (rev0) with LTE";
+	compatible = "google,villager-rev0-sku0", "qcom,sc7280";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts
new file mode 100644
index 0000000000000..2f05a19cc388e
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.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-r1.dts"
+#include "sc7280-herobrine-lte-sku.dtsi"
+
+/ {
+	model = "Google Villager (rev1+) with LTE";
+	compatible = "google,villager-sku0", "qcom,sc7280";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 5eb668991e249..6928a0908fcd6 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -13,6 +13,7 @@
 #include "pmk8350.dtsi"
 
 #include "sc7280-chrome-common.dtsi"
+#include "sc7280-herobrine-lte-sku.dtsi"
 
 / {
 	aliases {
-- 
2.25.1