Hi, On Fri, Sep 9, 2022 at 1:15 PM Sibi Sankar <quic_sibis@xxxxxxxxxxx> wrote: > > 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. > > Signed-off-by: Sibi Sankar <quic_sibis@xxxxxxxxxxx> > --- > > Depends on: > Add LTE SKUs for Villager: https://patchwork.kernel.org/project/linux-arm-msm/cover/20220830182923.3720287-1-dianders@xxxxxxxxxxxx/ > > Instead of just having remoteproc_mpss node disabled, we go ahead and > delete it on wifi only SKUs. This is done to avoid the dtbs_check > failures that we would end of getting if we delete the memory-region > property present in the node (since it's a required property). I'll > send a follow up patch with IPA node enabled only on LTE SKUs as soon > as I verify that it doesn't have any affects on suspend/resume. s/affects/effects > diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts > index 344338ad8a01..480cb88f2154 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts > @@ -9,6 +9,7 @@ > > #include "sc7280-idp.dtsi" > #include "sc7280-idp-ec-h1.dtsi" > +#include "sc7280-herobrine-lte-sku.dtsi" This is unrelated to the WiFi only separation, isn't it? This looks like it's fixing a bug in commit d42fae738f3a ("arm64: dts: qcom: Add LTE SKUs for sc7280-villager family") which removed a fragment from "sc7280-chrome-common.dtsi" but then didn't add it back to all the previous users. Not sure how I missed that. In any case, feels like this should be a separate commit with a Fixes. ...also: instead of adding this include to crd-r3 and idp2, though, why not just add it to "idp.dtsi"? Right now all things that include "idp.dtsi" are LTE SKUs, right? > / { > model = "Qualcomm Technologies, Inc. sc7280 CRD platform (rev3 - 4)"; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts > index ccbe50b6249a..6a2ffaac33bc 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts > @@ -8,6 +8,7 @@ > /dts-v1/; > > #include "sc7280-herobrine.dtsi" > +#include "sc7280-herobrine-wifi-sku.dtsi" I think this is wrong and evoker is a LTE SKU. I'll send out a patch shortly. > 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 f1017809e5da..ee3bca264f67 100644 > --- 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,10 @@ > * Copyright 2022 Google LLC. > */ > > -#include "sc7280-herobrine-villager-r1.dts" > +/dts-v1/; > + > +#include "sc7280-herobrine-villager.dtsi" > +#include "sc7280-herobrine-audio-wcd9385.dtsi" I don't think this is enough. villager-r1.dts also has some other things that you'll end up missing. I think you need to move the existing "villager-r1.dts" to be a dtsi file and then include it from both the new "villager-r1.dts" and "villager-r1-lte.dts"
