[PATCH] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards

[PATCH] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards

[Matthias Kaehlcke]

Enable the 'wifi' and 'remoteproc_wpss' nodes for all sc7280
based Chrome OS boards. Delete the corresponding entries from
sc7280-idp.dtsi since this file includes sc7280-chrome-common.dtsi.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---

 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 13 +++++++++++++
 arch/arm64/boot/dts/qcom/sc7280-idp.dtsi           | 11 -----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 9f4a9c263c35..0002e389bbe2 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -91,7 +91,20 @@ &remoteproc_mpss {
 	memory-region = <&mba_mem>, <&mpss_mem>;
 };
 
+&remoteproc_wpss {
+	status = "okay";
+	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";
+
+	wifi-firmware {
+		iommus = <&apps_smmu 0x1c02 0x1>;
+	};
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 5eb668991e24..9cea8fc7ff8b 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -560,14 +560,3 @@ sw_ctrl: sw-ctrl {
 		bias-pull-down;
 	};
 };
-
-&remoteproc_wpss {
-	status = "okay";
-};
-
-&wifi {
-	status = "okay";
-	wifi-firmware {
-		iommus = <&apps_smmu 0x1c02 0x1>;
-	};
-};
-- 
2.36.1.124.g0e6072fb45-goog

Re: [PATCH] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards

[Doug Anderson]

Hi,

On Wed, May 18, 2022 at 3:53 PM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> Enable the 'wifi' and 'remoteproc_wpss' nodes for all sc7280
> based Chrome OS boards. Delete the corresponding entries from
> sc7280-idp.dtsi since this file includes sc7280-chrome-common.dtsi.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
>
>  arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 13 +++++++++++++
>  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi           | 11 -----------
>  2 files changed, 13 insertions(+), 11 deletions(-)

Looks right to me. You're also adding the firmware-name, but:

* That's in the bindings.

* The name you have there matches what's in the linux-firmware
repository in commit 0d5e9f7e0aa1 ("ath11k: WCN6750 hw1.0: add to
WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1")

Hmmm, I guess one question is whether this same firmware would also be
used for other, non-Chrome sc7280 devices. If so then the
firmware-name probably belongs straight in sc7280.dtsi? I suppose that
could always happen in a future change if/when we have other sc7280
devices and it's clear that they're sharing firmware. Thus:

Reviewed-by: Douglas Anderson <dianders@chromium.org>

-Doug

Re: [PATCH] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards

[Matthias Kaehlcke]

On Fri, May 20, 2022 at 01:07:53PM -0700, Doug Anderson wrote:
> Hi,
> 
> On Wed, May 18, 2022 at 3:53 PM Matthias Kaehlcke <mka@chromium.org> wrote:
> >
> > Enable the 'wifi' and 'remoteproc_wpss' nodes for all sc7280
> > based Chrome OS boards. Delete the corresponding entries from
> > sc7280-idp.dtsi since this file includes sc7280-chrome-common.dtsi.
> >
> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> > ---
> >
> >  arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 13 +++++++++++++
> >  arch/arm64/boot/dts/qcom/sc7280-idp.dtsi           | 11 -----------
> >  2 files changed, 13 insertions(+), 11 deletions(-)
> 
> Looks right to me. You're also adding the firmware-name, but:
> 
> * That's in the bindings.
> 
> * The name you have there matches what's in the linux-firmware
> repository in commit 0d5e9f7e0aa1 ("ath11k: WCN6750 hw1.0: add to
> WLAN.MSL.1.0.1-00887-QCAMSLSWPLZ-1")
> 
> Hmmm, I guess one question is whether this same firmware would also be
> used for other, non-Chrome sc7280 devices. If so then the
> firmware-name probably belongs straight in sc7280.dtsi? I suppose that
> could always happen in a future change if/when we have other sc7280
> devices and it's clear that they're sharing firmware. Thus:

It could go either way. One of our wifi engineers mentioned that his
contact at QC said the FW should reside directly in /lib/firmware, not
in any sub-directory, which would be odd, but up to them ;-)

> Reviewed-by: Douglas Anderson <dianders@chromium.org>

Thanks!

Re: (subset) [PATCH] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards

[Bjorn Andersson]

On Wed, 18 May 2022 15:52:55 -0700, Matthias Kaehlcke wrote:
> Enable the 'wifi' and 'remoteproc_wpss' nodes for all sc7280
> based Chrome OS boards. Delete the corresponding entries from
> sc7280-idp.dtsi since this file includes sc7280-chrome-common.dtsi.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sc7280: Enable wifi for Chrome OS boards
      commit: 2a77ada5168af6c4ab8df1ea13655245f149b3fe

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>