arm64: dts: qcom: sc7280: Add Google Herobrine WIFI SKU dts fragment

The Google Herobrine WIFI SKU can save 256M by not having modem/mba/rmtfs
memory regions defined. Add the dts fragment and mark all the board files
appropriately.

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Sibi Sankar <quic_sibis@quicinc.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221110070813.1777-2-quic_sibis@quicinc.com

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 25f31c8..16fb203 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -39,20 +39,10 @@
                        no-map;
                };
 
-               mpss_mem: memory@8b800000 {
-                       reg = <0x0 0x8b800000 0x0 0xf600000>;
-                       no-map;
-               };
-
                wpss_mem: memory@9ae00000 {
                        reg = <0x0 0x9ae00000 0x0 0x1900000>;
                        no-map;
                };
-
-               mba_mem: memory@9c700000 {
-                       reg = <0x0 0x9c700000 0x0 0x200000>;
-                       no-map;
-               };
        };
 };
 
@@ -88,11 +78,6 @@
        firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
 };
 
-/* Increase the size from 2.5MB to 8MB */
-&rmtfs_mem {
-       reg = <0x0 0x9c900000 0x0 0x800000>;
-};
-
 &wifi {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
index 3af9224..14f20e7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts
@@ -5,7 +5,9 @@
  * Copyright 2022 Google LLC.
  */
 
-#include "sc7280-herobrine-evoker.dts"
+/dts-v1/;
+
+#include "sc7280-herobrine-evoker.dtsi"
 #include "sc7280-herobrine-lte-sku.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
index 51f0401..4f781fe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts
@@ -8,7 +8,7 @@
 /dts-v1/;
 
 #include "sc7280-herobrine-evoker.dtsi"
-#include "sc7280-herobrine-audio-rt5682-3mic.dtsi"
+#include "sc7280-herobrine-wifi-sku.dtsi"
 
 / {
        model = "Google Evoker";

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
index 706dd82..3d639c7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi
@@ -6,6 +6,7 @@
  */
 
 #include "sc7280-herobrine.dtsi"
+#include "sc7280-herobrine-audio-rt5682-3mic.dtsi"
 
 /*
  * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
index a92eecc..ad66e5e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
@@ -6,6 +6,20 @@
  */
 /* Modem setup is different on Chrome setups than typical Qualcomm setup */
 
+/ {
+       reserved-memory {
+               mpss_mem: memory@8b800000 {
+                       reg = <0x0 0x8b800000 0x0 0xf600000>;
+                       no-map;
+               };
+
+               mba_mem: memory@9c700000 {
+                       reg = <0x0 0x9c700000 0x0 0x200000>;
+                       no-map;
+               };
+       };
+};
+
 &remoteproc_mpss {
        compatible = "qcom,sc7280-mss-pil";
        iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
@@ -15,3 +29,8 @@
                        "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
        status = "okay";
 };
+
+/* Increase the size from 2.5MB to 8MB */
+&rmtfs_mem {
+       reg = <0x0 0x9c900000 0x0 0x800000>;
+};

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
index f101780..d71cc4b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1-lte.dts
@@ -5,7 +5,9 @@
  * Copyright 2022 Google LLC.
  */
 
-#include "sc7280-herobrine-villager-r1.dts"
+/dts-v1/;
+
+#include "sc7280-herobrine-villager-r1.dtsi"
 #include "sc7280-herobrine-lte-sku.dtsi"
 
 / {

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
index cfc6487..edb52f1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dts
@@ -7,37 +7,10 @@
 
 /dts-v1/;
 
-#include "sc7280-herobrine-villager.dtsi"
-#include "sc7280-herobrine-audio-wcd9385.dtsi"
+#include "sc7280-herobrine-villager-r1.dtsi"
+#include "sc7280-herobrine-wifi-sku.dtsi"
 
 / {
        model = "Google Villager (rev1+)";
        compatible = "google,villager", "qcom,sc7280";
 };
-
-&lpass_va_macro {
-       vdd-micb-supply = <&pp1800_l2c>;
-};
-
-&sound {
-       audio-routing =
-                       "IN1_HPHL", "HPHL_OUT",
-                       "IN2_HPHR", "HPHR_OUT",
-                       "AMIC1", "MIC BIAS1",
-                       "AMIC2", "MIC BIAS2",
-                       "VA DMIC0", "vdd-micb",
-                       "VA DMIC1", "vdd-micb",
-                       "VA DMIC2", "vdd-micb",
-                       "VA DMIC3", "vdd-micb",
-                       "TX SWR_ADC0", "ADC1_OUTPUT",
-                       "TX SWR_ADC1", "ADC2_OUTPUT",
-                       "TX SWR_ADC2", "ADC3_OUTPUT",
-                       "TX SWR_DMIC0", "DMIC1_OUTPUT",
-                       "TX SWR_DMIC1", "DMIC2_OUTPUT",
-                       "TX SWR_DMIC2", "DMIC3_OUTPUT",
-                       "TX SWR_DMIC3", "DMIC4_OUTPUT",
-                       "TX SWR_DMIC4", "DMIC5_OUTPUT",
-                       "TX SWR_DMIC5", "DMIC6_OUTPUT",
-                       "TX SWR_DMIC6", "DMIC7_OUTPUT",
-                       "TX SWR_DMIC7", "DMIC8_OUTPUT";
-};

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi
new file mode 100644 (file)
index 0000000..b25df5a
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r1.dtsi
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Villager board device tree source
+ *
+ * Copyright 2022 Google LLC.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sc7280-herobrine-villager.dtsi"
+#include "sc7280-herobrine-audio-wcd9385.dtsi"
+
+&lpass_va_macro {
+       vdd-micb-supply = <&pp1800_l2c>;
+};
+
+&sound {
+       audio-routing =
+                       "IN1_HPHL", "HPHL_OUT",
+                       "IN2_HPHR", "HPHR_OUT",
+                       "AMIC1", "MIC BIAS1",
+                       "AMIC2", "MIC BIAS2",
+                       "VA DMIC0", "vdd-micb",
+                       "VA DMIC1", "vdd-micb",
+                       "VA DMIC2", "vdd-micb",
+                       "VA DMIC3", "vdd-micb",
+                       "TX SWR_ADC0", "ADC1_OUTPUT",
+                       "TX SWR_ADC1", "ADC2_OUTPUT",
+                       "TX SWR_ADC2", "ADC3_OUTPUT",
+                       "TX SWR_DMIC0", "DMIC1_OUTPUT",
+                       "TX SWR_DMIC1", "DMIC2_OUTPUT",
+                       "TX SWR_DMIC2", "DMIC3_OUTPUT",
+                       "TX SWR_DMIC3", "DMIC4_OUTPUT",
+                       "TX SWR_DMIC4", "DMIC5_OUTPUT",
+                       "TX SWR_DMIC5", "DMIC6_OUTPUT",
+                       "TX SWR_DMIC6", "DMIC7_OUTPUT",
+                       "TX SWR_DMIC7", "DMIC8_OUTPUT";
+};

diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
new file mode 100644 (file)
index 0000000..2febd61
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-wifi-sku.dtsi
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Google Herobrine dts fragment for WIFI SKUs
+ *
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/* WIFI SKUs save 256M by not having modem/mba/rmtfs memory regions defined. */
+
+/delete-node/ &remoteproc_mpss;
+/delete-node/ &rmtfs_mem;