* [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-22 19:05 [PATCH 0/4] sdm845: Update firmware paths David Heidelberg via B4 Relay
@ 2025-12-22 19:05 ` David Heidelberg via B4 Relay
2025-12-22 19:31 ` Akhil P Oommen
2025-12-22 19:05 ` [PATCH 2/4] arm64: dts: qcom: sdm845-axolotl: " David Heidelberg via B4 Relay
` (3 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: David Heidelberg via B4 Relay @ 2025-12-22 19:05 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, David Heidelberg
From: David Heidelberg <david@ixit.cz>
Conform to the new firmware path scheme.
Includes cosmetic cleanups.
Signed-off-by: David Heidelberg <david@ixit.cz>
---
.../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index db6dd04c51bb5..f1c63794db979 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
};
&adsp_pas {
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
};
&apps_rsc {
@@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
};
&cdsp_pas {
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
};
&gcc {
@@ -370,7 +372,7 @@ &gpu {
};
&gpu_zap_shader {
- firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
};
&i2c10 {
@@ -422,7 +424,8 @@ rmi4_f12: rmi4-f12@12 {
&ipa {
qcom,gsi-loader = "self";
memory-region = <&ipa_fw_mem>;
- firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn";
+
status = "okay";
};
@@ -474,8 +477,10 @@ &mdss_dsi0_phy {
/* Modem/wifi */
&mss_pil {
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/mba.mbn",
+ "qcom/sdm845/OnePlus/enchilada/modem.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
};
&pm8998_gpios {
@@ -593,7 +598,8 @@ &qup_uart9_tx {
};
&slpi_pas {
- firmware-name = "qcom/sdm845/oneplus6/slpi.mbn";
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/slpi.mbn";
+
status = "okay";
};
@@ -744,7 +750,7 @@ bluetooth {
* This path is relative to the qca/
* subdir under lib/firmware.
*/
- firmware-name = "oneplus6/crnv21.bin";
+ firmware-name = "OnePlus/enchilada/crnv21.bin";
vddio-supply = <&vreg_s4a_1p8>;
vddxo-supply = <&vreg_l7a_1p8>;
@@ -906,8 +912,9 @@ speaker_default: speaker-default-state {
};
&venus {
+ firmware-name = "qcom/sdm845/OnePlus/enchilada/venus.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/oneplus6/venus.mbn";
};
&wcd9340 {
--
2.51.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-22 19:05 ` [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: " David Heidelberg via B4 Relay
@ 2025-12-22 19:31 ` Akhil P Oommen
2025-12-22 19:51 ` David Heidelberg
2025-12-23 22:07 ` Dmitry Baryshkov
0 siblings, 2 replies; 14+ messages in thread
From: Akhil P Oommen @ 2025-12-22 19:31 UTC (permalink / raw)
To: david
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
>
> Conform to the new firmware path scheme.
> Includes cosmetic cleanups.
>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
> .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 ++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> index db6dd04c51bb5..f1c63794db979 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> @@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
> };
>
> &adsp_pas {
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
> +
> status = "okay";
> - firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
> };
>
> &apps_rsc {
> @@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
> };
>
> &cdsp_pas {
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
> +
> status = "okay";
> - firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
> };
>
> &gcc {
> @@ -370,7 +372,7 @@ &gpu {
> };
>
> &gpu_zap_shader {
> - firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
I believe this is considered as breaking backward compatibility. How
about creating a symlink in linux-firmware instead.
-Akhil.
> };
>
> &i2c10 {
> @@ -422,7 +424,8 @@ rmi4_f12: rmi4-f12@12 {
> &ipa {
> qcom,gsi-loader = "self";
> memory-region = <&ipa_fw_mem>;
> - firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn";
> +
> status = "okay";
> };
>
> @@ -474,8 +477,10 @@ &mdss_dsi0_phy {
>
> /* Modem/wifi */
> &mss_pil {
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/mba.mbn",
> + "qcom/sdm845/OnePlus/enchilada/modem.mbn";
> +
> status = "okay";
> - firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
> };
>
> &pm8998_gpios {
> @@ -593,7 +598,8 @@ &qup_uart9_tx {
> };
>
> &slpi_pas {
> - firmware-name = "qcom/sdm845/oneplus6/slpi.mbn";
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/slpi.mbn";
> +
> status = "okay";
> };
>
> @@ -744,7 +750,7 @@ bluetooth {
> * This path is relative to the qca/
> * subdir under lib/firmware.
> */
> - firmware-name = "oneplus6/crnv21.bin";
> + firmware-name = "OnePlus/enchilada/crnv21.bin";
>
> vddio-supply = <&vreg_s4a_1p8>;
> vddxo-supply = <&vreg_l7a_1p8>;
> @@ -906,8 +912,9 @@ speaker_default: speaker-default-state {
> };
>
> &venus {
> + firmware-name = "qcom/sdm845/OnePlus/enchilada/venus.mbn";
> +
> status = "okay";
> - firmware-name = "qcom/sdm845/oneplus6/venus.mbn";
> };
>
> &wcd9340 {
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-22 19:31 ` Akhil P Oommen
@ 2025-12-22 19:51 ` David Heidelberg
2025-12-24 13:18 ` Akhil P Oommen
2025-12-23 22:07 ` Dmitry Baryshkov
1 sibling, 1 reply; 14+ messages in thread
From: David Heidelberg @ 2025-12-22 19:51 UTC (permalink / raw)
To: Akhil P Oommen
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On 22/12/2025 20:31, Akhil P Oommen wrote:
> On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
>> From: David Heidelberg <david@ixit.cz>
>>
>> Conform to the new firmware path scheme.
>> Includes cosmetic cleanups.
>>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
>> ---
>> .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 ++++++++++++++--------
>> 1 file changed, 15 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> index db6dd04c51bb5..f1c63794db979 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>> @@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
>> };
>>
>> &adsp_pas {
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
>> +
>> status = "okay";
>> - firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
>> };
>>
>> &apps_rsc {
>> @@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
>> };
>>
>> &cdsp_pas {
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
>> +
>> status = "okay";
>> - firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
>> };
>>
>> &gcc {
>> @@ -370,7 +372,7 @@ &gpu {
>> };
>>
>> &gpu_zap_shader {
>> - firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
>
> I believe this is considered as breaking backward compatibility. How
> about creating a symlink in linux-firmware instead.
See discussion here:
https://lore.kernel.org/linux-arm-msm/CAO9ioeW9=TPde4P=AOcQANvPv90K-9MkcRRgb7HNwe8KiOpFjQ@mail.gmail.com/
I understood the conclusion was "let's do it".
We have more-less 3 consumers here,
- postmarketOS (Alpine)
- Mobian (Debian)
- NixOS Mobile (NixOS)
some of these using droid-juicer, which can be easily updated to update
paths.
David
>
> -Akhil.
>
>> };
>>
>> &i2c10 {
>> @@ -422,7 +424,8 @@ rmi4_f12: rmi4-f12@12 {
>> &ipa {
>> qcom,gsi-loader = "self";
>> memory-region = <&ipa_fw_mem>;
>> - firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn";
>> +
>> status = "okay";
>> };
>>
>> @@ -474,8 +477,10 @@ &mdss_dsi0_phy {
>>
>> /* Modem/wifi */
>> &mss_pil {
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/mba.mbn",
>> + "qcom/sdm845/OnePlus/enchilada/modem.mbn";
>> +
>> status = "okay";
>> - firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/oneplus6/modem.mbn";
>> };
>>
>> &pm8998_gpios {
>> @@ -593,7 +598,8 @@ &qup_uart9_tx {
>> };
>>
>> &slpi_pas {
>> - firmware-name = "qcom/sdm845/oneplus6/slpi.mbn";
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/slpi.mbn";
>> +
>> status = "okay";
>> };
>>
>> @@ -744,7 +750,7 @@ bluetooth {
>> * This path is relative to the qca/
>> * subdir under lib/firmware.
>> */
>> - firmware-name = "oneplus6/crnv21.bin";
>> + firmware-name = "OnePlus/enchilada/crnv21.bin";
>>
>> vddio-supply = <&vreg_s4a_1p8>;
>> vddxo-supply = <&vreg_l7a_1p8>;
>> @@ -906,8 +912,9 @@ speaker_default: speaker-default-state {
>> };
>>
>> &venus {
>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/venus.mbn";
>> +
>> status = "okay";
>> - firmware-name = "qcom/sdm845/oneplus6/venus.mbn";
>> };
>>
>> &wcd9340 {
>>
>
--
David Heidelberg
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-22 19:51 ` David Heidelberg
@ 2025-12-24 13:18 ` Akhil P Oommen
2025-12-24 15:14 ` Dmitry Baryshkov
0 siblings, 1 reply; 14+ messages in thread
From: Akhil P Oommen @ 2025-12-24 13:18 UTC (permalink / raw)
To: David Heidelberg, Dmitry Baryshkov
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On 12/23/2025 1:21 AM, David Heidelberg wrote:
> On 22/12/2025 20:31, Akhil P Oommen wrote:
>> On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
>>> From: David Heidelberg <david@ixit.cz>
>>>
>>> Conform to the new firmware path scheme.
>>> Includes cosmetic cleanups.
>>>
>>> Signed-off-by: David Heidelberg <david@ixit.cz>
>>> ---
>>> .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 +++++++++++
>>> +++--------
>>> 1 file changed, 15 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/
>>> arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>>> index db6dd04c51bb5..f1c63794db979 100644
>>> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
>>> @@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
>>> };
>>> &adsp_pas {
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
>>> +
>>> status = "okay";
>>> - firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
>>> };
>>> &apps_rsc {
>>> @@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
>>> };
>>> &cdsp_pas {
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
>>> +
>>> status = "okay";
>>> - firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
>>> };
>>> &gcc {
>>> @@ -370,7 +372,7 @@ &gpu {
>>> };
>>> &gpu_zap_shader {
>>> - firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
>>
>> I believe this is considered as breaking backward compatibility. How
>> about creating a symlink in linux-firmware instead.
>
> See discussion here:
>
> https://lore.kernel.org/linux-arm-msm/
> CAO9ioeW9=TPde4P=AOcQANvPv90K-9MkcRRgb7HNwe8KiOpFjQ@mail.gmail.com/
>
> I understood the conclusion was "let's do it".
>
> We have more-less 3 consumers here,
> - postmarketOS (Alpine)
> - Mobian (Debian)
> - NixOS Mobile (NixOS)
>
> some of these using droid-juicer, which can be easily updated to update
> paths.
>
Dmitry,
How is this "not breaking backward compatibility"?
-Akhil.
> David
>
>>
>> -Akhil.
>>
>>> };
>>> &i2c10 {
>>> @@ -422,7 +424,8 @@ rmi4_f12: rmi4-f12@12 {
>>> &ipa {
>>> qcom,gsi-loader = "self";
>>> memory-region = <&ipa_fw_mem>;
>>> - firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn";
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/ipa_fws.mbn";
>>> +
>>> status = "okay";
>>> };
>>> @@ -474,8 +477,10 @@ &mdss_dsi0_phy {
>>> /* Modem/wifi */
>>> &mss_pil {
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/mba.mbn",
>>> + "qcom/sdm845/OnePlus/enchilada/modem.mbn";
>>> +
>>> status = "okay";
>>> - firmware-name = "qcom/sdm845/oneplus6/mba.mbn", "qcom/sdm845/
>>> oneplus6/modem.mbn";
>>> };
>>> &pm8998_gpios {
>>> @@ -593,7 +598,8 @@ &qup_uart9_tx {
>>> };
>>> &slpi_pas {
>>> - firmware-name = "qcom/sdm845/oneplus6/slpi.mbn";
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/slpi.mbn";
>>> +
>>> status = "okay";
>>> };
>>> @@ -744,7 +750,7 @@ bluetooth {
>>> * This path is relative to the qca/
>>> * subdir under lib/firmware.
>>> */
>>> - firmware-name = "oneplus6/crnv21.bin";
>>> + firmware-name = "OnePlus/enchilada/crnv21.bin";
>>> vddio-supply = <&vreg_s4a_1p8>;
>>> vddxo-supply = <&vreg_l7a_1p8>;
>>> @@ -906,8 +912,9 @@ speaker_default: speaker-default-state {
>>> };
>>> &venus {
>>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/venus.mbn";
>>> +
>>> status = "okay";
>>> - firmware-name = "qcom/sdm845/oneplus6/venus.mbn";
>>> };
>>> &wcd9340 {
>>>
>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-24 13:18 ` Akhil P Oommen
@ 2025-12-24 15:14 ` Dmitry Baryshkov
0 siblings, 0 replies; 14+ messages in thread
From: Dmitry Baryshkov @ 2025-12-24 15:14 UTC (permalink / raw)
To: Akhil P Oommen
Cc: David Heidelberg, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-msm, devicetree,
linux-kernel
On Wed, Dec 24, 2025 at 06:48:53PM +0530, Akhil P Oommen wrote:
> On 12/23/2025 1:21 AM, David Heidelberg wrote:
> > On 22/12/2025 20:31, Akhil P Oommen wrote:
> >> On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
> >>> From: David Heidelberg <david@ixit.cz>
> >>>
> >>> Conform to the new firmware path scheme.
> >>> Includes cosmetic cleanups.
> >>>
> >>> Signed-off-by: David Heidelberg <david@ixit.cz>
> >>> ---
> >>> .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 +++++++++++
> >>> +++--------
> >>> 1 file changed, 15 insertions(+), 8 deletions(-)
> >>>
> >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/
> >>> arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> >>> index db6dd04c51bb5..f1c63794db979 100644
> >>> --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> >>> @@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
> >>> };
> >>> &adsp_pas {
> >>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
> >>> +
> >>> status = "okay";
> >>> - firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
> >>> };
> >>> &apps_rsc {
> >>> @@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
> >>> };
> >>> &cdsp_pas {
> >>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
> >>> +
> >>> status = "okay";
> >>> - firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
> >>> };
> >>> &gcc {
> >>> @@ -370,7 +372,7 @@ &gpu {
> >>> };
> >>> &gpu_zap_shader {
> >>> - firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
> >>> + firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
> >>
> >> I believe this is considered as breaking backward compatibility. How
> >> about creating a symlink in linux-firmware instead.
> >
> > See discussion here:
> >
> > https://lore.kernel.org/linux-arm-msm/
> > CAO9ioeW9=TPde4P=AOcQANvPv90K-9MkcRRgb7HNwe8KiOpFjQ@mail.gmail.com/
> >
> > I understood the conclusion was "let's do it".
> >
> > We have more-less 3 consumers here,
> > - postmarketOS (Alpine)
> > - Mobian (Debian)
> > - NixOS Mobile (NixOS)
> >
> > some of these using droid-juicer, which can be easily updated to update
> > paths.
> >
>
> Dmitry,
>
> How is this "not breaking backward compatibility"?
Indeed, it is a very gray zone. There is slight difference: firmware
loading can go through the userspace, which can provide backwards
compatibility (in form of fw helper, symlinks or any other ways).
So, yes, we break compatibility, but it is documented so and it can be
handled. Compare that with the e.g. updated driver rejecting old
bindings and thus becoming incompatible with the old DT. This can't be
worked around in any way.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
2025-12-22 19:31 ` Akhil P Oommen
2025-12-22 19:51 ` David Heidelberg
@ 2025-12-23 22:07 ` Dmitry Baryshkov
1 sibling, 0 replies; 14+ messages in thread
From: Dmitry Baryshkov @ 2025-12-23 22:07 UTC (permalink / raw)
To: Akhil P Oommen
Cc: david, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, linux-arm-msm, devicetree,
linux-kernel
On Tue, Dec 23, 2025 at 01:01:42AM +0530, Akhil P Oommen wrote:
> On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
> > From: David Heidelberg <david@ixit.cz>
> >
> > Conform to the new firmware path scheme.
> > Includes cosmetic cleanups.
> >
> > Signed-off-by: David Heidelberg <david@ixit.cz>
> > ---
> > .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 ++++++++++++++--------
> > 1 file changed, 15 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > index db6dd04c51bb5..f1c63794db979 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
> > @@ -181,8 +181,9 @@ panel_vddi_poc_1p8: panel-vddi-poc-regulator {
> > };
> >
> > &adsp_pas {
> > + firmware-name = "qcom/sdm845/OnePlus/enchilada/adsp.mbn";
> > +
> > status = "okay";
> > - firmware-name = "qcom/sdm845/oneplus6/adsp.mbn";
> > };
> >
> > &apps_rsc {
> > @@ -353,8 +354,9 @@ vreg_s3c_0p6: smps3 {
> > };
> >
> > &cdsp_pas {
> > + firmware-name = "qcom/sdm845/OnePlus/enchilada/cdsp.mbn";
> > +
> > status = "okay";
> > - firmware-name = "qcom/sdm845/oneplus6/cdsp.mbn";
> > };
> >
> > &gcc {
> > @@ -370,7 +372,7 @@ &gpu {
> > };
> >
> > &gpu_zap_shader {
> > - firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
> > + firmware-name = "qcom/sdm845/OnePlus/enchilada/a630_zap.mbn";
>
> I believe this is considered as breaking backward compatibility. How
> about creating a symlink in linux-firmware instead.
OnePlus is not supported in linux-firmware.
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/4] arm64: dts: qcom: sdm845-axolotl: Update firmware paths
2025-12-22 19:05 [PATCH 0/4] sdm845: Update firmware paths David Heidelberg via B4 Relay
2025-12-22 19:05 ` [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: " David Heidelberg via B4 Relay
@ 2025-12-22 19:05 ` David Heidelberg via B4 Relay
2025-12-23 22:07 ` Dmitry Baryshkov
2025-12-22 19:05 ` [PATCH 3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: " David Heidelberg via B4 Relay
` (2 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: David Heidelberg via B4 Relay @ 2025-12-22 19:05 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, David Heidelberg
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-shift-axolotl.dts | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index ddc2b3ca3bc57..a35c120361c19 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -108,8 +108,9 @@ vreg_s4a_1p8: pm8998-smps4 {
};
&adsp_pas {
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/adsp.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/axolotl/adsp.mbn";
};
&apps_rsc {
@@ -409,8 +410,9 @@ vreg_s3c_0p6: smps3 {
};
&cdsp_pas {
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/cdsp.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/axolotl/cdsp.mbn";
};
&gcc {
@@ -426,7 +428,7 @@ &gpu {
};
&gpu_zap_shader {
- firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/a630_zap.mbn";
};
&i2c5 {
@@ -458,7 +460,8 @@ &i2c10 {
&ipa {
qcom,gsi-loader = "self";
memory-region = <&ipa_fw_mem>;
- firmware-name = "qcom/sdm845/axolotl/ipa_fws.mbn";
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/ipa_fws.mbn";
+
status = "okay";
};
@@ -502,8 +505,9 @@ &mdss_dsi0_phy {
};
&mss_pil {
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/mba.mbn", "qcom/sdm845/SHIFT/axolotl/modem.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/axolotl/mba.mbn", "qcom/sdm845/axolotl/modem.mbn";
};
&pm8998_gpios {
@@ -597,7 +601,8 @@ &qupv3_id_1 {
};
&slpi_pas {
- firmware-name = "qcom/sdm845/axolotl/slpi.mbn";
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/slpi.mbn";
+
status = "okay";
};
@@ -673,7 +678,7 @@ bluetooth {
* This path is relative to the qca/
* subdir under lib/firmware.
*/
- firmware-name = "axolotl/crnv21.bin";
+ firmware-name = "SHIFT/axolotl/crnv21.bin";
vddio-supply = <&vreg_s4a_1p8>;
vddxo-supply = <&vreg_l7a_1p8>;
@@ -727,8 +732,9 @@ &usb_1_qmpphy {
};
&venus {
+ firmware-name = "qcom/sdm845/SHIFT/axolotl/venus.mbn";
+
status = "okay";
- firmware-name = "qcom/sdm845/axolotl/venus.mbn";
};
&wifi {
--
2.51.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 2/4] arm64: dts: qcom: sdm845-axolotl: Update firmware paths
2025-12-22 19:05 ` [PATCH 2/4] arm64: dts: qcom: sdm845-axolotl: " David Heidelberg via B4 Relay
@ 2025-12-23 22:07 ` Dmitry Baryshkov
0 siblings, 0 replies; 14+ messages in thread
From: Dmitry Baryshkov @ 2025-12-23 22:07 UTC (permalink / raw)
To: david
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Mon, Dec 22, 2025 at 08:05:38PM +0100, David Heidelberg via B4 Relay wrote:
> 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-shift-axolotl.dts | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: Update firmware paths
2025-12-22 19:05 [PATCH 0/4] sdm845: Update firmware paths David Heidelberg via B4 Relay
2025-12-22 19:05 ` [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: " David Heidelberg via B4 Relay
2025-12-22 19:05 ` [PATCH 2/4] arm64: dts: qcom: sdm845-axolotl: " David Heidelberg via B4 Relay
@ 2025-12-22 19:05 ` David Heidelberg via B4 Relay
2025-12-23 22:08 ` Dmitry Baryshkov
2025-12-22 19:05 ` [PATCH 4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: " David Heidelberg via B4 Relay
2026-01-03 17:51 ` [PATCH 0/4] sdm845: " Bjorn Andersson
4 siblings, 1 reply; 14+ messages in thread
From: David Heidelberg via B4 Relay @ 2025-12-22 19:05 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, David Heidelberg
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-samsung-starqltechn.dts | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
index 5d41a92cfebff..77f5872de6f19 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
@@ -254,7 +254,7 @@ &gpu {
};
&gpu_zap_shader {
- firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
+ firmware-name = "qcom/sdm845/Samsung/starqltechn/a630_zap.mbn";
};
&mdss {
@@ -699,7 +699,8 @@ touchscreen@48 {
};
&adsp_pas {
- firmware-name = "qcom/sdm845/starqltechn/adsp.mbn";
+ firmware-name = "qcom/sdm845/Samsung/starqltechn/adsp.mbn";
+
status = "okay";
};
@@ -904,20 +905,22 @@ &wcd9340 {
};
&mss_pil {
- firmware-name = "qcom/sdm845/starqltechn/mba.mbn",
- "qcom/sdm845/starqltechn/modem.mbn";
+ firmware-name = "qcom/sdm845/Samsung/starqltechn/mba.mbn",
+ "qcom/sdm845/Samsung/starqltechn/modem.mbn";
+
status = "okay";
};
&ipa {
qcom,gsi-loader = "self";
memory-region = <&ipa_fw_mem>;
- firmware-name = "qcom/sdm845/starqltechn/ipa_fws.mbn";
+ firmware-name = "qcom/sdm845/Samsung/starqltechn/ipa_fws.mbn";
+
status = "okay";
};
&slpi_pas {
- firmware-name = "qcom/sdm845/starqltechn/slpi.mbn";
+ firmware-name = "qcom/sdm845/Samsung/starqltechn/slpi.mbn";
cx-supply = <&slpi_regulator>;
status = "okay";
--
2.51.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: Update firmware paths
2025-12-22 19:05 ` [PATCH 3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: " David Heidelberg via B4 Relay
@ 2025-12-23 22:08 ` Dmitry Baryshkov
0 siblings, 0 replies; 14+ messages in thread
From: Dmitry Baryshkov @ 2025-12-23 22:08 UTC (permalink / raw)
To: david
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Mon, Dec 22, 2025 at 08:05:39PM +0100, David Heidelberg via B4 Relay wrote:
> 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-samsung-starqltechn.dts | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: Update firmware paths
2025-12-22 19:05 [PATCH 0/4] sdm845: Update firmware paths David Heidelberg via B4 Relay
` (2 preceding siblings ...)
2025-12-22 19:05 ` [PATCH 3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: " David Heidelberg via B4 Relay
@ 2025-12-22 19:05 ` David Heidelberg via B4 Relay
2025-12-24 0:29 ` Dmitry Baryshkov
2026-01-03 17:51 ` [PATCH 0/4] sdm845: " Bjorn Andersson
4 siblings, 1 reply; 14+ messages in thread
From: David Heidelberg via B4 Relay @ 2025-12-22 19:05 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley
Cc: linux-arm-msm, devicetree, linux-kernel, David Heidelberg
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
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: Update firmware paths
2025-12-22 19:05 ` [PATCH 4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: " David Heidelberg via B4 Relay
@ 2025-12-24 0:29 ` Dmitry Baryshkov
0 siblings, 0 replies; 14+ messages in thread
From: Dmitry Baryshkov @ 2025-12-24 0:29 UTC (permalink / raw)
To: david
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, linux-arm-msm, devicetree, linux-kernel
On Mon, Dec 22, 2025 at 08:05:40PM +0100, David Heidelberg via B4 Relay wrote:
> 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(-)
>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/4] sdm845: Update firmware paths
2025-12-22 19:05 [PATCH 0/4] sdm845: Update firmware paths David Heidelberg via B4 Relay
` (3 preceding siblings ...)
2025-12-22 19:05 ` [PATCH 4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: " David Heidelberg via B4 Relay
@ 2026-01-03 17:51 ` Bjorn Andersson
4 siblings, 0 replies; 14+ messages in thread
From: Bjorn Andersson @ 2026-01-03 17:51 UTC (permalink / raw)
To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
David Heidelberg
Cc: linux-arm-msm, devicetree, linux-kernel
On Mon, 22 Dec 2025 20:05:36 +0100, David Heidelberg wrote:
> Update the paths for phones, where there are no patches pending which
> includes the firmware path update.
>
> I haven't touched the sdm845-mtp and db845c intentionally.
>
> After merging, I'll notify distros and send MR against droid-juicer.
>
> [...]
Applied, thanks!
[1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths
commit: 29e87dc07d705bd92d57fff77703ca272779e6a0
[2/4] arm64: dts: qcom: sdm845-axolotl: Update firmware paths
commit: 5eac5422c0c0a8a14800405b658e99beaacf90de
[3/4] arm64: dts: qcom: sdm845-samsung-starqltechn: Update firmware paths
commit: 7e46a9c78880f4a7589bb31f8887ea3edb0596b4
[4/4] arm64: dts: qcom: sdm845-xiaomi-polaris: Update firmware paths
commit: 86057e01967b8eeb8604904322003de044528e7a
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 14+ messages in thread