summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2021-06-01 01:44:53 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2021-09-22 02:24:22 +0300
commit0f6b380d580cd081d5e385d349f55dfc52e3d68c (patch)
treedf44c74092cd3149815844b1bddf269fc5bc1a49
parentb464f08ca769947c4bb9d37548c21711efca326b (diff)
downloadlinux-0f6b380d580cd081d5e385d349f55dfc52e3d68c.tar.xz
arm64: dts: qcom: apq8016-sbc: Update modem and WiFi firmware path
The firmware for the modem and WiFi subsystems platform specific and is signed with a OEM specific key (or a test key). In order to support more than a single device it is therefor not possible to rely on the default path and stash these files directly in the firmware directory. This has already been addressed for other platforms, but the APQ8016 SBC (aka db410c) was never finished upstream. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Stephan Gerhold <stephan@gerhold.net> Tested-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20210531224453.783218-1-bjorn.andersson@linaro.org
-rw-r--r--arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi12
-rw-r--r--arch/arm64/boot/dts/qcom/msm8916.dtsi2
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index f8d8f3e3664e..351c68d29afb 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -305,6 +305,12 @@
status = "okay";
};
+&mpss {
+ status = "okay";
+
+ firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mbn";
+};
+
&pm8916_resin {
status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
@@ -312,6 +318,8 @@
&pronto {
status = "okay";
+
+ firmware-name = "qcom/msm8916/wcnss.mbn";
};
&sdhc_1 {
@@ -394,6 +402,10 @@
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
};
+&wcnss_ctrl {
+ firmware-name = "qcom/msm8916/WCNSS_qcom_wlan_nv.bin";
+};
+
/* Enable CoreSight */
&cti0 { status = "okay"; };
&cti1 { status = "okay"; };
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 3f85e34a8ce6..008b98fe8c6b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1765,7 +1765,7 @@
label = "pronto";
- wcnss {
+ wcnss_ctrl: wcnss {
compatible = "qcom,wcnss";
qcom,smd-channels = "WCNSS_CTRL";