2022-07-26 09:58:15

by Jimmy Chen

[permalink] [raw]
Subject: [PATCH v8 3/3] arm64: dts: qcom: Add LTE SKUs for sc7280-villager family

This adds LTE skus for villager device tree files.

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

(no changes since v6)

Changes in v6:
- Remove v5 accidentally added sc7280-herobrine-herobrine-r1-lte.dts

Changes in v5:
- Reorder '.dtb' in Makefile
- Put the "interconnects" line back

Changes in v4:
- Reorder 'status' last

arch/arm64/boot/dts/qcom/Makefile | 2 ++
.../boot/dts/qcom/sc7280-chrome-common.dtsi | 11 -----------
.../boot/dts/qcom/sc7280-herobrine-crd.dts | 1 +
.../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
.../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 +++++++++++++++++
.../qcom/sc7280-herobrine-villager-r0-lte.dts | 14 ++++++++++++++
.../qcom/sc7280-herobrine-villager-r1-lte.dts | 14 ++++++++++++++
arch/arm64/boot/dts/qcom/sc7280-idp.dts | 1 +
8 files changed, 50 insertions(+), 11 deletions(-)
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 2c1605e00d349..24eacbf330880 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -103,7 +103,9 @@ 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_ARCH_QCOM) += sc7280-herobrine-villager-r0-lte.dtb
dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.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 cfe2741456a1a..25f31c81b2b74 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -83,17 +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>;
- interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
- memory-region = <&mba_mem>, <&mpss_mem>;
- firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
- "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
-};
-
&remoteproc_wpss {
status = "okay";
firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
index e9ca6c5d24a16..921eccfec39ae 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
@@ -9,6 +9,7 @@

#include "sc7280-herobrine.dtsi"
#include "sc7280-herobrine-audio-wcd9385.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.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
index c1647a85a371a..c1a6719687252 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
@@ -8,6 +8,7 @@
/dts-v1/;

#include "sc7280-herobrine.dtsi"
+#include "sc7280-herobrine-lte-sku.dtsi"

/ {
model = "Google Herobrine (rev1+)";
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..a92eeccd2b2a9
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
@@ -0,0 +1,17 @@
+// 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 {
+ compatible = "qcom,sc7280-mss-pil";
+ iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
+ interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
+ memory-region = <&mba_mem>, <&mpss_mem>;
+ firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
+ "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
+ status = "okay";
+};
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.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 6d3ff80582ae9..fba7e938ce35a 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -10,6 +10,7 @@
#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
#include "sc7280-idp.dtsi"
#include "pmr735a.dtsi"
+#include "sc7280-herobrine-lte-sku.dtsi"

/ {
model = "Qualcomm Technologies, Inc. sc7280 IDP SKU1 platform";
--
2.25.1


2022-08-24 10:44:40

by Sibi Sankar

[permalink] [raw]
Subject: Re: [PATCH v8 3/3] arm64: dts: qcom: Add LTE SKUs for sc7280-villager family

Hey Jimmy,

Thanks for the patch.

On 7/26/22 3:15 PM, Jimmy Chen wrote:
> This adds LTE skus for villager device tree files.
>
> Signed-off-by: Jimmy Chen <[email protected]>
> Reviewed-by: Douglas Anderson <[email protected]>
> ---
>
> (no changes since v6)
>
> Changes in v6:
> - Remove v5 accidentally added sc7280-herobrine-herobrine-r1-lte.dts
>
> Changes in v5:
> - Reorder '.dtb' in Makefile
> - Put the "interconnects" line back
>
> Changes in v4:
> - Reorder 'status' last
>
> arch/arm64/boot/dts/qcom/Makefile | 2 ++
> .../boot/dts/qcom/sc7280-chrome-common.dtsi | 11 -----------
> .../boot/dts/qcom/sc7280-herobrine-crd.dts | 1 +
> .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
> .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 +++++++++++++++++
> .../qcom/sc7280-herobrine-villager-r0-lte.dts | 14 ++++++++++++++
> .../qcom/sc7280-herobrine-villager-r1-lte.dts | 14 ++++++++++++++
> arch/arm64/boot/dts/qcom/sc7280-idp.dts | 1 +
> 8 files changed, 50 insertions(+), 11 deletions(-)
> 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 2c1605e00d349..24eacbf330880 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -103,7 +103,9 @@ 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_ARCH_QCOM) += sc7280-herobrine-villager-r0-lte.dtb
> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.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 cfe2741456a1a..25f31c81b2b74 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> @@ -83,17 +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>;
> - interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
> - memory-region = <&mba_mem>, <&mpss_mem>;
> - firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
> - "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
> -};
> -
> &remoteproc_wpss {
> status = "okay";
> firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> index e9ca6c5d24a16..921eccfec39ae 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> @@ -9,6 +9,7 @@
>
> #include "sc7280-herobrine.dtsi"
> #include "sc7280-herobrine-audio-wcd9385.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.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> index c1647a85a371a..c1a6719687252 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> @@ -8,6 +8,7 @@
> /dts-v1/;
>
> #include "sc7280-herobrine.dtsi"
> +#include "sc7280-herobrine-lte-sku.dtsi"
>
> / {
> model = "Google Herobrine (rev1+)";
> 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..a92eeccd2b2a9
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
> @@ -0,0 +1,17 @@
> +// 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 {
> + compatible = "qcom,sc7280-mss-pil";
> + iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
> + interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
> + memory-region = <&mba_mem>, <&mpss_mem>;
> + firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
> + "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
> + status = "okay";
> +};

We shoud probably move the mpss_mem, mba_mem and rmtfs_mem here as
well, that way we save an additional ~255M.

-Sibi

> 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.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> index 6d3ff80582ae9..fba7e938ce35a 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> @@ -10,6 +10,7 @@
> #include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
> #include "sc7280-idp.dtsi"
> #include "pmr735a.dtsi"
> +#include "sc7280-herobrine-lte-sku.dtsi"
>
> / {
> model = "Qualcomm Technologies, Inc. sc7280 IDP SKU1 platform";
>

2022-08-24 15:40:15

by Doug Anderson

[permalink] [raw]
Subject: Re: [PATCH v8 3/3] arm64: dts: qcom: Add LTE SKUs for sc7280-villager family

Hi,

On Wed, Aug 24, 2022 at 3:11 AM Sibi Sankar <[email protected]> wrote:
>
> Hey Jimmy,
>
> Thanks for the patch.
>
> On 7/26/22 3:15 PM, Jimmy Chen wrote:
> > This adds LTE skus for villager device tree files.
> >
> > Signed-off-by: Jimmy Chen <[email protected]>
> > Reviewed-by: Douglas Anderson <[email protected]>
> > ---
> >
> > (no changes since v6)
> >
> > Changes in v6:
> > - Remove v5 accidentally added sc7280-herobrine-herobrine-r1-lte.dts
> >
> > Changes in v5:
> > - Reorder '.dtb' in Makefile
> > - Put the "interconnects" line back
> >
> > Changes in v4:
> > - Reorder 'status' last
> >
> > arch/arm64/boot/dts/qcom/Makefile | 2 ++
> > .../boot/dts/qcom/sc7280-chrome-common.dtsi | 11 -----------
> > .../boot/dts/qcom/sc7280-herobrine-crd.dts | 1 +
> > .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
> > .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 +++++++++++++++++
> > .../qcom/sc7280-herobrine-villager-r0-lte.dts | 14 ++++++++++++++
> > .../qcom/sc7280-herobrine-villager-r1-lte.dts | 14 ++++++++++++++
> > arch/arm64/boot/dts/qcom/sc7280-idp.dts | 1 +
> > 8 files changed, 50 insertions(+), 11 deletions(-)
> > 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 2c1605e00d349..24eacbf330880 100644
> > --- a/arch/arm64/boot/dts/qcom/Makefile
> > +++ b/arch/arm64/boot/dts/qcom/Makefile
> > @@ -103,7 +103,9 @@ 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_ARCH_QCOM) += sc7280-herobrine-villager-r0-lte.dtb
> > dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.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 cfe2741456a1a..25f31c81b2b74 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> > @@ -83,17 +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>;
> > - interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
> > - memory-region = <&mba_mem>, <&mpss_mem>;
> > - firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
> > - "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
> > -};
> > -
> > &remoteproc_wpss {
> > status = "okay";
> > firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
> > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> > index e9ca6c5d24a16..921eccfec39ae 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
> > @@ -9,6 +9,7 @@
> >
> > #include "sc7280-herobrine.dtsi"
> > #include "sc7280-herobrine-audio-wcd9385.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.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> > index c1647a85a371a..c1a6719687252 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
> > @@ -8,6 +8,7 @@
> > /dts-v1/;
> >
> > #include "sc7280-herobrine.dtsi"
> > +#include "sc7280-herobrine-lte-sku.dtsi"
> >
> > / {
> > model = "Google Herobrine (rev1+)";
> > 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..a92eeccd2b2a9
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
> > @@ -0,0 +1,17 @@
> > +// 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 {
> > + compatible = "qcom,sc7280-mss-pil";
> > + iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
> > + interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
> > + memory-region = <&mba_mem>, <&mpss_mem>;
> > + firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
> > + "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
> > + status = "okay";
> > +};
>
> We shoud probably move the mpss_mem, mba_mem and rmtfs_mem here as
> well, that way we save an additional ~255M.

That sounds like a great idea. I wonder if it would be possible for
Bjorn to land Jimmy's patches as-is and perhaps you could send a
follow-up patch?

-Doug

2022-08-25 05:40:21

by Sibi Sankar

[permalink] [raw]
Subject: Re: [PATCH v8 3/3] arm64: dts: qcom: Add LTE SKUs for sc7280-villager family



On 8/24/22 8:55 PM, Doug Anderson wrote:
> Hi,
>
> On Wed, Aug 24, 2022 at 3:11 AM Sibi Sankar <[email protected]> wrote:
>>
>> Hey Jimmy,
>>
>> Thanks for the patch.
>>
>> On 7/26/22 3:15 PM, Jimmy Chen wrote:
>>> This adds LTE skus for villager device tree files.
>>>
>>> Signed-off-by: Jimmy Chen <[email protected]>
>>> Reviewed-by: Douglas Anderson <[email protected]>
>>> ---
>>>
>>> (no changes since v6)
>>>
>>> Changes in v6:
>>> - Remove v5 accidentally added sc7280-herobrine-herobrine-r1-lte.dts
>>>
>>> Changes in v5:
>>> - Reorder '.dtb' in Makefile
>>> - Put the "interconnects" line back
>>>
>>> Changes in v4:
>>> - Reorder 'status' last
>>>
>>> arch/arm64/boot/dts/qcom/Makefile | 2 ++
>>> .../boot/dts/qcom/sc7280-chrome-common.dtsi | 11 -----------
>>> .../boot/dts/qcom/sc7280-herobrine-crd.dts | 1 +
>>> .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 +
>>> .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 17 +++++++++++++++++
>>> .../qcom/sc7280-herobrine-villager-r0-lte.dts | 14 ++++++++++++++
>>> .../qcom/sc7280-herobrine-villager-r1-lte.dts | 14 ++++++++++++++
>>> arch/arm64/boot/dts/qcom/sc7280-idp.dts | 1 +
>>> 8 files changed, 50 insertions(+), 11 deletions(-)
>>> 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 2c1605e00d349..24eacbf330880 100644
>>> --- a/arch/arm64/boot/dts/qcom/Makefile
>>> +++ b/arch/arm64/boot/dts/qcom/Makefile
>>> @@ -103,7 +103,9 @@ 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_ARCH_QCOM) += sc7280-herobrine-villager-r0-lte.dtb
>>> dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.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 cfe2741456a1a..25f31c81b2b74 100644
>>> --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
>>> @@ -83,17 +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>;
>>> - interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
>>> - memory-region = <&mba_mem>, <&mpss_mem>;
>>> - firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
>>> - "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
>>> -};
>>> -
>>> &remoteproc_wpss {
>>> status = "okay";
>>> firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";
>>> diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
>>> index e9ca6c5d24a16..921eccfec39ae 100644
>>> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts
>>> @@ -9,6 +9,7 @@
>>>
>>> #include "sc7280-herobrine.dtsi"
>>> #include "sc7280-herobrine-audio-wcd9385.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.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
>>> index c1647a85a371a..c1a6719687252 100644
>>> --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts
>>> @@ -8,6 +8,7 @@
>>> /dts-v1/;
>>>
>>> #include "sc7280-herobrine.dtsi"
>>> +#include "sc7280-herobrine-lte-sku.dtsi"
>>>
>>> / {
>>> model = "Google Herobrine (rev1+)";
>>> 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..a92eeccd2b2a9
>>> --- /dev/null
>>> +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi
>>> @@ -0,0 +1,17 @@
>>> +// 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 {
>>> + compatible = "qcom,sc7280-mss-pil";
>>> + iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>;
>>> + interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
>>> + memory-region = <&mba_mem>, <&mpss_mem>;
>>> + firmware-name = "qcom/sc7280-herobrine/modem/mba.mbn",
>>> + "qcom/sc7280-herobrine/modem/qdsp6sw.mbn";
>>> + status = "okay";
>>> +};
>>
>> We shoud probably move the mpss_mem, mba_mem and rmtfs_mem here as
>> well, that way we save an additional ~255M.
>
> That sounds like a great idea. I wonder if it would be possible for
> Bjorn to land Jimmy's patches as-is and perhaps you could send a
> follow-up patch?

ack

Reviewed-by: Sibi Sankar <[email protected]>

>
> -Doug
>