| Message ID | SG2PR03MB500697A11DA5D0B45DE41B0ECC819@SG2PR03MB5006.apcprd03.prod.outlook.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] arm64: dts: qcom: Add LTE SKUs for sc7280-villager family | expand |
On 5.07.2022 04:22, Jimmy Chen wrote: > This adds LTE skus for villager device tree files. > > Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com> > --- > > arch/arm64/boot/dts/qcom/Makefile | 2 ++ > .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 ----------- > arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + > .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + > .../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.dts | 1 + > 8 files changed, 48 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 bb9f4eb3e65a0..6d81ff12f5af2 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -103,6 +103,8 @@ 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-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..a4809dd2f4e8a > --- /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 { Hi, just a minor nit. It was recently agreed upon that the status property should go last to make things consistent with other DTs (qcom is - as usual - a special snowflake :D). Could you please fix that up? The rest looks good. Konrad > + 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.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";
Hi, On Mon, Jul 4, 2022 at 7:22 PM Jimmy Chen <jinghung.chen3@hotmail.com> wrote: > > This adds LTE skus for villager device tree files. > > Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com> > --- > > arch/arm64/boot/dts/qcom/Makefile | 2 ++ > .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 ----------- > arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + > .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + > .../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.dts | 1 + > 8 files changed, 48 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 High level comment: your threading is very strange here. Can you use "git send-email" to send your patches? It's definitely hard to follow things. Patch #2 in the series should be "In-Reply-To" patch #1. > diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile > index bb9f4eb3e65a0..6d81ff12f5af2 100644 > --- a/arch/arm64/boot/dts/qcom/Makefile > +++ b/arch/arm64/boot/dts/qcom/Makefile > @@ -103,6 +103,8 @@ 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-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..a4809dd2f4e8a > --- /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. > + */ Blank line here please. > +/* 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" You can't include this file because it doesn't exist upstream. It wouldn't be hard for you to post a patch adding it, though. You could make a 3-patch series. Patch #1 is the bindings, patch #2 adds villager-r1, and patch #3 adds the LTE bits.
Hi, On Wed, Jul 6, 2022 at 5:31 AM Konrad Dybcio <konrad.dybcio@somainline.org> wrote: > > > > On 5.07.2022 04:22, Jimmy Chen wrote: > > This adds LTE skus for villager device tree files. > > > > Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com> > > --- > > > > arch/arm64/boot/dts/qcom/Makefile | 2 ++ > > .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 ----------- > > arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + > > .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + > > .../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.dts | 1 + > > 8 files changed, 48 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 bb9f4eb3e65a0..6d81ff12f5af2 100644 > > --- a/arch/arm64/boot/dts/qcom/Makefile > > +++ b/arch/arm64/boot/dts/qcom/Makefile > > @@ -103,6 +103,8 @@ 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-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..a4809dd2f4e8a > > --- /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 { > Hi, just a minor nit. > > It was recently agreed upon that the status property should go last to > make things consistent with other DTs (qcom is - as usual - a special > snowflake :D). Could you please fix that up? The rest looks good. > > Konrad I'm not aware of this new convention. Can you please provide a link? -Doug
On 7.07.2022 01:51, Doug Anderson wrote: > Hi, > > On Wed, Jul 6, 2022 at 5:31 AM Konrad Dybcio > <konrad.dybcio@somainline.org> wrote: >> >> >> >> On 5.07.2022 04:22, Jimmy Chen wrote: >>> This adds LTE skus for villager device tree files. >>> >>> Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com> >>> --- >>> >>> arch/arm64/boot/dts/qcom/Makefile | 2 ++ >>> .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 ----------- >>> arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + >>> .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + >>> .../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.dts | 1 + >>> 8 files changed, 48 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 bb9f4eb3e65a0..6d81ff12f5af2 100644 >>> --- a/arch/arm64/boot/dts/qcom/Makefile >>> +++ b/arch/arm64/boot/dts/qcom/Makefile >>> @@ -103,6 +103,8 @@ 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-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..a4809dd2f4e8a >>> --- /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 { >> Hi, just a minor nit. >> >> It was recently agreed upon that the status property should go last to >> make things consistent with other DTs (qcom is - as usual - a special >> snowflake :D). Could you please fix that up? The rest looks good. >> >> Konrad > > I'm not aware of this new convention. Can you please provide a link? We've discussed it here [1], plus seemingly all other DTs (though I did not in fact check *all* other DTs, just a few from different vendors' subdirectories) seem to put it last, so I think we concluded that not standing out makes sense.. The DT spec itself does not specify where it should go, but this could possibly be a good addition to it.. Konrad [1] https://www.spinics.net/lists/linux-arm-msm/msg115444.html > > -Doug
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index bb9f4eb3e65a0..6d81ff12f5af2 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -103,6 +103,8 @@ 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-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..a4809dd2f4e8a --- /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.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";
This adds LTE skus for villager device tree files. Signed-off-by: Jimmy Chen <jinghung.chen3@hotmail.com> --- arch/arm64/boot/dts/qcom/Makefile | 2 ++ .../arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 ----------- arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 1 + .../dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + .../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.dts | 1 + 8 files changed, 48 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