Re: [PATCH 1/4] arm64: dts: qcom: sdm845-oneplus: Update firmware paths

[Akhil P Oommen]

On 12/23/2025 12:35 AM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@xxxxxxx>
> 
> Conform to the new firmware path scheme.
> Includes cosmetic cleanups.
> 
> Signed-off-by: David Heidelberg <david@xxxxxxx>
> ---
>  .../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 {
>