From: David Heidelberg <david@ixit.cz>
Conform to the new firmware path scheme.
Includes cosmetic cleanups.
Signed-off-by: David Heidelberg <david@ixit.cz>
---
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 30e88ff010a39..a44d6e776c82e 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -370,7 +370,8 @@ vreg_smp3c_0p6: smps3 {
};
&cdsp_pas {
- firmware-name = "qcom/sdm845/polaris/cdsp.mbn";
+ firmware-name = "qcom/sdm845/Xiaomi/polaris/cdsp.mbn";
+
status = "okay";
};
@@ -395,7 +396,7 @@ &gpu {
};
&gpu_zap_shader {
- firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
+ firmware-name = "qcom/sdm845/Xiaomi/polaris/a630_zap.mbn";
};
&ibb {
@@ -410,7 +411,8 @@ &ibb {
&ipa {
qcom,gsi-loader = "self";
memory-region = <&ipa_fw_mem>;
- firmware-name = "qcom/sdm845/polaris/ipa_fws.mbn";
+ firmware-name = "qcom/sdm845/Xiaomi/polaris/ipa_fws.mbn";
+
status = "okay";
};
@@ -502,7 +504,9 @@ &mdss_dsi0_phy {
};
&mss_pil {
- firmware-name = "qcom/sdm845/polaris/mba.mbn", "qcom/sdm845/polaris/modem.mbn";
+ firmware-name = "qcom/sdm845/Xiaomi/polaris/mba.mbn",
+ "qcom/sdm845/Xiaomi/polaris/modem.mbn";
+
status = "okay";
};
@@ -623,7 +627,7 @@ bluetooth {
compatible = "qcom,wcn3990-bt";
/* This path is relative to the qca/ subdir under lib/firmware. */
- firmware-name = "polaris/crnv21.bin";
+ firmware-name = "Xiaomi/polaris/crnv21.bin";
vddio-supply = <&vreg_s4a_1p8>;
vddxo-supply = <&vreg_l7a_1p8>;
@@ -683,7 +687,8 @@ &ufs_mem_phy {
};
&venus {
- firmware-name = "qcom/sdm845/polaris/venus.mbn";
+ firmware-name = "qcom/sdm845/Xiaomi/polaris/venus.mbn";
+
status = "okay";
};
--
2.51.0