arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
PATCH 1/1 arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
Commit 0f6b380d580c ("arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path") added "firmware-name"s to the APQ8016 SBC (DB410c) device tree to separate the (test key)-signed firmware from other devices.
However, the added names are a bit confusing. The "modem" firmware used by DB410c is actually a simplified version for APQ8016 that lacks most of the modem functionality (phone calls, SMS etc) that is available on MSM8916. Placing it in "qcom/msm8916/modem.mbn" suggests that it supports all functionality for MSM and not just the reduced functionality for APQ.
Request the firmware from "qcom/apq8016/modem.mbn" instead to clarify this. Do the same for "wcnss.mbn" for consistency (although the WCNSS firmware works just fine on MSM8916).
Finally, add a "_sbc" suffix to the WCNSS_qcom_wlan_nv.bin firmware file. It seems like the nv.bin firmware is somewhat board specific and can therefore vary a bit from device to device. This makes it more clear which board it is intended to be used for.
---
The new "firmware-name"s have not been in a kernel release yet and have also not been submitted for linux-firmware yet so I think it is still fine to change this.
I realized this while starting to make some packaging changes for this and I think the new names are a bit clearer than the current ones. :)
--- arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +3 -3
@@ -308,7 +308,7 @@ &mdss { &mpss { status = "okay"; - firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn"; + firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn"; }; &pm8916_resin {
@@ -319,7 +319,7 @@ &pm8916_resin { &pronto { status = "okay"; - firmware-name = "qcom/msm8916/wcnss.mbn"; + firmware-name = "qcom/apq8016/wcnss.mbn"; }; &sdhc_1 {
@@ -403,7 +403,7 @@ &wcd_codec { }; &wcnss_ctrl { - firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin"; + firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; }; /* Enable CoreSight */
Signature · 1 line
2.33.0
This patch was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:
Hello:
This patch was applied to qcom/linux.git (for-next) by Bjorn Andersson <[email protected]>:
Quoted 11 lines · On Wed, 22 Sep 2021 21:58:53 +0200 you wrote:
Commit
0f6b380d580c("arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path") added "firmware-name"s to the APQ8016 SBC (DB410c) device tree to separate the (test key)-signed firmware from other devices.However, the added names are a bit confusing. The "modem" firmware used by DB410c is actually a simplified version for APQ8016 that lacks most of the modem functionality (phone calls, SMS etc) that is available on MSM8916. Placing it in "qcom/msm8916/modem.mbn" suggests that it supports all functionality for MSM and not just the reduced functionality for APQ.
[...]
Here is the summary with links:
- arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
https://git.kernel.org/qcom/c/2533786f46d0
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
Bjorn Andersson
AppliedRe: (subset) [PATCH] arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
In reply to Stephan GerholdQuoted 11 lines · Stephan Gerhold
Commit
0f6b380d580c("arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path") added "firmware-name"s to the APQ8016 SBC (DB410c) device tree to separate the (test key)-signed firmware from other devices.However, the added names are a bit confusing. The "modem" firmware used by DB410c is actually a simplified version for APQ8016 that lacks most of the modem functionality (phone calls, SMS etc) that is available on MSM8916. Placing it in "qcom/msm8916/modem.mbn" suggests that it supports all functionality for MSM and not just the reduced functionality for APQ.
[...]
Applied, thanks!
[1/1] arm64: dts: qcom: apq8016-sbc: Clarify firmware-names
commit: 2533786f46d074d67a4bca04c2d44d3825594415
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>