diff mbox series

[v2,3/5] arm64: dts: qcom: sdm845-mtp: switch to mbn firmware

Message ID 20230826221915.846937-4-dmitry.baryshkov@linaro.org
State Accepted
Commit 37857110db63783bac36960aa3bd335d4adea9d7
Headers show
Series arm64: dts: qcom: sdm845-mtp: misc improvements | expand

Commit Message

Dmitry Baryshkov Aug. 26, 2023, 10:19 p.m. UTC 
We have switched most of devices to use mbn (squashed) firmware files
instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
Let's switch adsp and cdsp firmware files to use .mbn format too.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Bjorn Andersson Oct. 16, 2023, 3:43 p.m. UTC | #1 
On Mon, Oct 16, 2023 at 03:39:01PM +0200, Arnd Bergmann wrote:
> On Sun, Aug 27, 2023, at 00:19, Dmitry Baryshkov wrote:
> > We have switched most of devices to use mbn (squashed) firmware files
> > instead of spit mdt+bNN. Even this DT uses modem.mbn and a630_zap.mbn.
> > Let's switch adsp and cdsp firmware files to use .mbn format too.
> >
> > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> 
> I saw this pop up in the dts pull request today, and this needs
> some more clarification I think: Why does the dts have to know
> about which format the files are in? I would expect that to be
> handled by the driver internally.
> 
> From what I can tell, either the two files are compatible,
> and the driver can just try both names by manipulating that
> string, or the two are incompatible and changing the firmware
> name would also mean that the dts node and driver would
> have to be aware of the difference.
> 

The implementation does not care about the file name, it will detect
which of the two formats is being provided and load the content
accordingly.

So what this patch does is to align the firmware file name to match what
we have in linux-firmware, and what the few of us booting this device
have hacked around in /lib/firmware for (quite) a while now.

Regards,
Bjorn
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 56f5bf52d9bd..7579ba66c6d8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -114,7 +114,7 @@  trip-point {
 
 &adsp_pas {
 	status = "okay";
-	firmware-name = "qcom/sdm845/adsp.mdt";
+	firmware-name = "qcom/sdm845/adsp.mbn";
 };
 
 &apps_rsc {
@@ -415,7 +415,7 @@  vreg_s3c_0p6: smps3 {
 
 &cdsp_pas {
 	status = "okay";
-	firmware-name = "qcom/sdm845/cdsp.mdt";
+	firmware-name = "qcom/sdm845/cdsp.mbn";
 };
 
 &gcc {