| Message ID | 20200716191746.23196-1-sibis@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4dc8ff06efa193a7644f7bf5cad37c2b6c53f93b |
| Headers | show |
| Series | arm64: dts: qcom: sc7180: Move the fixed-perm property to SoC dtsi | expand |
Hi, On Thu, Jul 16, 2020 at 12:18 PM Sibi Sankar <sibis@codeaurora.org> wrote: > > All the platforms using SC7180 SoC are expected to have the wlan firmware > memory statically mapped by the Trusted Firmware. Hence move back the > qcom,msa-fixed-perm property to the SoC dtsi. > > Fixes: 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node") > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 - > arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > index 860fc4658b8b1..26cc4913d3ddc 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -392,7 +392,6 @@ video-firmware { > > &wifi { > status = "okay"; > - qcom,msa-fixed-perm; > vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>; > vdd-1.8-xo-supply = <&vreg_l1c_1p8>; > vdd-1.3-rfa-supply = <&vreg_l2c_1p3>; > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 126e2fce26c1a..a91d3f074625e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -3233,6 +3233,7 @@ wifi: wifi@18800000 { > <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>, > <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>; > memory-region = <&wlan_mem>; > + qcom,msa-fixed-perm; Seems good to me. If someone ever comes up with a firmware where it's sane to not have this property, we can either delete the property from those boards or migrate the property to the the existing board dts files. Reviewed-by: Douglas Anderson <dianders@chromium.org>
On Thu 16 Jul 12:17 PDT 2020, Sibi Sankar wrote: > All the platforms using SC7180 SoC are expected to have the wlan firmware > memory statically mapped by the Trusted Firmware. Hence move back the > qcom,msa-fixed-perm property to the SoC dtsi. > > Fixes: 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node") > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Thank you, applied. > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 - > arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > index 860fc4658b8b1..26cc4913d3ddc 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -392,7 +392,6 @@ video-firmware { > > &wifi { > status = "okay"; > - qcom,msa-fixed-perm; > vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>; > vdd-1.8-xo-supply = <&vreg_l1c_1p8>; > vdd-1.3-rfa-supply = <&vreg_l2c_1p3>; > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 126e2fce26c1a..a91d3f074625e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -3233,6 +3233,7 @@ wifi: wifi@18800000 { > <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>, > <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>; > memory-region = <&wlan_mem>; > + qcom,msa-fixed-perm; > status = "disabled"; > }; > }; > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project >
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 860fc4658b8b1..26cc4913d3ddc 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -392,7 +392,6 @@ video-firmware { &wifi { status = "okay"; - qcom,msa-fixed-perm; vdd-0.8-cx-mx-supply = <&vreg_l9a_0p6>; vdd-1.8-xo-supply = <&vreg_l1c_1p8>; vdd-1.3-rfa-supply = <&vreg_l2c_1p3>; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 126e2fce26c1a..a91d3f074625e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3233,6 +3233,7 @@ wifi: wifi@18800000 { <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>, <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>; memory-region = <&wlan_mem>; + qcom,msa-fixed-perm; status = "disabled"; }; };
All the platforms using SC7180 SoC are expected to have the wlan firmware memory statically mapped by the Trusted Firmware. Hence move back the qcom,msa-fixed-perm property to the SoC dtsi. Fixes: 7d484566087c0 ("arm64: dts: qcom: sc7180: Add missing properties for Wifi node") Signed-off-by: Sibi Sankar <sibis@codeaurora.org> --- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 - arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)