[RFC PATCH 0/7] arm64: qcom: dts: correct firmware paths

[RFC PATCH 0/7] arm64: qcom: dts: correct firmware paths

[Dmitry Baryshkov]

This patchset corrects firmware paths for several Qualcomm-based devices
to include the SoC name. This is sent as an RFC to settle on the
firmware paths for Sony devices.

Dmitry Baryshkov (7):
  arm64: qcom: dts: c630: correct firmware paths
  arm64: qcom: dts: w737: correct firmware paths
  arm64: qcom: dts: miix-630: correct firmware paths
  arm64: qcom: dts: ifc6560: correct firmware paths
  arm64: qcom: dts: sagami: correct firmware paths
  arm64: qcom: dts: pdx223: correct firmware paths
  arm64: qcom: dts: nile: correct firmware paths

 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts   |  4 ++--
 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts    |  2 +-
 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi  |  2 +-
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts   |  8 ++++----
 arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts       | 10 +++++-----
 .../arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +++++-----
 .../boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

-- 
2.35.1

[RFC PATCH 1/7] arm64: qcom: dts: c630: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Lenovo Yoga C630 to include the SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index be59a8ba9c1f..35d367bf97a4 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -94,7 +94,7 @@ backlight: backlight {
 };
 
 &adsp_pas {
-	firmware-name = "qcom/LENOVO/81JL/qcadsp850.mbn";
+	firmware-name = "qcom/sdm850/LENOVO/81JL/qcadsp850.mbn";
 	status = "okay";
 };
 
@@ -306,7 +306,7 @@ vreg_lvs2a_1p8: lvs2 {
 };
 
 &cdsp_pas {
-	firmware-name = "qcom/LENOVO/81JL/qccdsp850.mbn";
+	firmware-name = "qcom/sdm850/LENOVO/81JL/qccdsp850.mbn";
 	status = "okay";
 };
 
@@ -345,7 +345,7 @@ &gpu {
 	status = "okay";
 	zap-shader {
 		memory-region = <&gpu_mem>;
-		firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
+		firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
 	};
 };
 
@@ -475,7 +475,7 @@ &mdss {
 
 &mss_pil {
 	status = "okay";
-	firmware-name = "qcom/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/LENOVO/81JL/qcdsp2850.mbn";
+	firmware-name = "qcom/sdm850/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/sdm850/LENOVO/81JL/qcdsp2850.mbn";
 };
 
 &qup_i2c10_default {
-- 
2.35.1

[RFC PATCH 2/7] arm64: qcom: dts: w737: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Samsung Galaxy Book2 to include the SoC
name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
index f954fe5cb61a..78eb967041e5 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
@@ -124,7 +124,7 @@ spss_mem: memory@98f00000 {
 };
 
 &adsp_pas {
-	firmware-name = "qcom/samsung/w737/qcadsp850.mbn";
+	firmware-name = "qcom/sdm850/samsung/w737/qcadsp850.mbn";
 	status = "okay";
 };
 
@@ -336,7 +336,7 @@ vreg_lvs2a_1p8: lvs2 {
 };
 
 &cdsp_pas {
-	firmware-name = "qcom/samsung/w737/qccdsp850.mbn";
+	firmware-name = "qcom/sdm850/samsung/w737/qccdsp850.mbn";
 	status = "okay";
 };
 
@@ -385,7 +385,7 @@ digitizer@9 {
 &ipa {
 	status = "okay";
 	memory-region = <&ipa_fw_mem>;
-	firmware-name = "qcom/samsung/w737/ipa_fws.elf";
+	firmware-name = "qcom/sdm850/samsung/w737/ipa_fws.elf";
 };
 
 /* No idea why it causes an SError when enabled */
@@ -395,7 +395,7 @@ &llcc {
 
 &mss_pil {
 	status = "okay";
-	firmware-name = "qcom/samsung/w737/qcdsp1v2850.mbn", "qcom/samsung/w737/qcdsp2850.mbn";
+	firmware-name = "qcom/sdm850/samsung/w737/qcdsp1v2850.mbn", "qcom/sdm850/samsung/w737/qcdsp2850.mbn";
 };
 
 &qup_i2c10_default {
@@ -696,7 +696,7 @@ &usb_2_qmpphy {
 
 &venus {
 	status = "okay";
-	firmware-name = "qcom/samsung/w737/qcvss850.mbn";
+	firmware-name = "qcom/sdm850/samsung/w737/qcvss850.mbn";
 };
 
 &wcd9340{
-- 
2.35.1

[RFC PATCH 3/7] arm64: qcom: dts: miix-630: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Lenovo Miix 630 to include the SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
index cf81c33a9d7e..a105143bee4a 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-lenovo-miix-630.dts
@@ -28,8 +28,8 @@ keyboard@3a {
 };
 
 &remoteproc_mss {
-	firmware-name = "qcom/LENOVO/81F1/qcdsp1v28998.mbn",
-			"qcom/LENOVO/81F1/qcdsp28998.mbn";
+	firmware-name = "qcom/msm8998/LENOVO/81F1/qcdsp1v28998.mbn",
+			"qcom/msm8998/LENOVO/81F1/qcdsp28998.mbn";
 };
 
 &sdhc2 {
-- 
2.35.1

[RFC PATCH 4/7] arm64: qcom: dts: ifc6560: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Inforce IFC6560 to include the SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
index 28050bc5f081..04e1b12b971e 100644
--- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
+++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
@@ -99,7 +99,7 @@ v5p0_boost: v5p0-boost-regulator {
 };
 
 &adsp_pil {
-	firmware-name = "qcom/ifc6560/adsp.mbn";
+	firmware-name = "qcom/sda660/ifc6560/adsp.mbn";
 };
 
 &blsp_i2c6 {
-- 
2.35.1

[RFC PATCH 5/7] arm64: qcom: dts: sagami: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Sony Xperia Sagami devices to include the
SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
index b3c9952ac173..e0940cb58681 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
@@ -77,12 +77,12 @@ ramoops@ffc00000 {
 
 &adsp {
 	status = "okay";
-	firmware-name = "qcom/adsp.mbn";
+	firmware-name = "qcom/sdm8350/sagami/adsp.mbn";
 };
 
 &cdsp {
 	status = "okay";
-	firmware-name = "qcom/cdsp.mbn";
+	firmware-name = "qcom/sdm8350/sagami/cdsp.mbn";
 };
 
 &i2c1 {
@@ -175,12 +175,12 @@ &i2c17 {
 &ipa {
 	status = "okay";
 	memory-region = <&pil_ipa_fw_mem>;
-	firmware-name = "qcom/ipa_fws.mbn";
+	firmware-name = "qcom/sdm8350/sagami/ipa_fws.mbn";
 };
 
 &mpss {
 	status = "okay";
-	firmware-name = "qcom/modem.mbn";
+	firmware-name = "qcom/sdm8350/sagami/modem.mbn";
 };
 
 &pmk8350_rtc {
@@ -210,7 +210,7 @@ &qupv3_id_2 {
 
 &slpi {
 	status = "okay";
-	firmware-name = "qcom/slpi.mbn";
+	firmware-name = "qcom/sdm8350/sagami/slpi.mbn";
 };
 
 &spi14 {
-- 
2.35.1

[RFC PATCH 6/7] arm64: qcom: dts: pdx223: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Sony Xperia 1 IV to include the SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
index d68765eb6d4f..ae867dbe4762 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
@@ -523,17 +523,17 @@ &pcie0_phy {
 };
 
 &remoteproc_adsp {
-	firmware-name = "qcom/adsp.mbn";
+	firmware-name = "qcom/sdm8450/pdx223/adsp.mbn";
 	status = "okay";
 };
 
 &remoteproc_cdsp {
-	firmware-name = "qcom/cdsp.mbn";
+	firmware-name = "qcom/sdm8450/pdx223/cdsp.mbn";
 	status = "okay";
 };
 
 &remoteproc_slpi {
-	firmware-name = "qcom/slpi.mbn";
+	firmware-name = "qcom/sdm8450/pdx223/slpi.mbn";
 	status = "okay";
 };
 
-- 
2.35.1

[RFC PATCH 7/7] arm64: qcom: dts: nile: correct firmware paths

[Dmitry Baryshkov]

Correct firmware paths for the Sony Xperia Nile devices to include the
SoC name.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 09c07800793a..71b9e3170d63 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -155,7 +155,7 @@ extcon_usb: extcon-usb {
 };
 
 &adsp_pil {
-	firmware-name = "adsp.mdt";
+	firmware-name = "qcom/sdm630/nile/adsp.mdt";
 };
 
 &blsp_i2c1 {
-- 
2.35.1

Re: [RFC PATCH 5/7] arm64: qcom: dts: sagami: correct firmware paths

[Konrad Dybcio]

On 15.09.2022 17:26, Dmitry Baryshkov wrote:
> Correct firmware paths for the Sony Xperia Sagami devices to include the
> SoC name.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  .../arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> index b3c9952ac173..e0940cb58681 100644
> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
> @@ -77,12 +77,12 @@ ramoops@ffc00000 {
>  
>  &adsp {
>  	status = "okay";
> -	firmware-name = "qcom/adsp.mbn";
> +	firmware-name = "qcom/sdm8350/sagami/adsp.mbn";
sm8350 ;)

I think it would be cleaner to follow with what's currently in linux-firmware [1],
so "qcom/socname/vendor/platform-or-device". Xperias have a single key per SoC, so
per-platform is fine here. Should be the same for other vendors, but no guarantees.

In this particular case, I think qcom/sm8350/SOMC/sagami would be appropriate, as
it seems like SONY is still internally using that name [2] (SOny Mobile Communications)
(sidenote: they are still using the legacy SEMC / Sony Ericsson Mobile
Communications in some places if you dig deep enough :D), buuuut they can't seem
to decide, might as well make it PlayStation at this point haha


Konrad

[1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/qcom/sc8280xp/LENOVO
[2] https://github.com/sonyxperiadev/kernel-copyleft-dts/blob/64.0.A.2.xxx/devicetree/qcom/waipio-nagara-pdx223_generic.dts#L10
>  };
>  
>  &cdsp {
>  	status = "okay";
> -	firmware-name = "qcom/cdsp.mbn";
> +	firmware-name = "qcom/sdm8350/sagami/cdsp.mbn";
>  };
>  
>  &i2c1 {
> @@ -175,12 +175,12 @@ &i2c17 {
>  &ipa {
>  	status = "okay";
>  	memory-region = <&pil_ipa_fw_mem>;
> -	firmware-name = "qcom/ipa_fws.mbn";
> +	firmware-name = "qcom/sdm8350/sagami/ipa_fws.mbn";
>  };
>  
>  &mpss {
>  	status = "okay";
> -	firmware-name = "qcom/modem.mbn";
> +	firmware-name = "qcom/sdm8350/sagami/modem.mbn";
>  };
>  
>  &pmk8350_rtc {
> @@ -210,7 +210,7 @@ &qupv3_id_2 {
>  
>  &slpi {
>  	status = "okay";
> -	firmware-name = "qcom/slpi.mbn";
> +	firmware-name = "qcom/sdm8350/sagami/slpi.mbn";
>  };
>  
>  &spi14 {

Re: [RFC PATCH 6/7] arm64: qcom: dts: pdx223: correct firmware paths

[Konrad Dybcio]

On 15.09.2022 17:26, Dmitry Baryshkov wrote:
> Correct firmware paths for the Sony Xperia 1 IV to include the SoC name.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
SONY/not-SONY discussion from my Sagami email aside, it's fine to
change pdx223 to nagara here, as its cousin, the 5 IV was announced
like 2 weeks ago and looking at the fw that was uploaded to their
OTA servers, I can tell they are still using a single key for
devices sharing the same SoC, as they always has been.

Konrad
>  .../boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts      | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
> index d68765eb6d4f..ae867dbe4762 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
> @@ -523,17 +523,17 @@ &pcie0_phy {
>  };
>  
>  &remoteproc_adsp {
> -	firmware-name = "qcom/adsp.mbn";
> +	firmware-name = "qcom/sdm8450/pdx223/adsp.mbn";
>  	status = "okay";
>  };
>  
>  &remoteproc_cdsp {
> -	firmware-name = "qcom/cdsp.mbn";
> +	firmware-name = "qcom/sdm8450/pdx223/cdsp.mbn";
>  	status = "okay";
>  };
>  
>  &remoteproc_slpi {
> -	firmware-name = "qcom/slpi.mbn";
> +	firmware-name = "qcom/sdm8450/pdx223/slpi.mbn";
>  	status = "okay";
>  };
>  

Re: [RFC PATCH 7/7] arm64: qcom: dts: nile: correct firmware paths

[Konrad Dybcio]

On 15.09.2022 17:26, Dmitry Baryshkov wrote:
> Correct firmware paths for the Sony Xperia Nile devices to include the
> SoC name.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
SONY/non-SONY discussion aside again, nile is totally fine here

Konrad
>  arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> index 09c07800793a..71b9e3170d63 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
> @@ -155,7 +155,7 @@ extcon_usb: extcon-usb {
>  };
>  
>  &adsp_pil {
> -	firmware-name = "adsp.mdt";
> +	firmware-name = "qcom/sdm630/nile/adsp.mdt";
>  };
>  
>  &blsp_i2c1 {

Re: [RFC PATCH 5/7] arm64: qcom: dts: sagami: correct firmware paths

[Dmitry Baryshkov]

On 17 September 2022 16:07:13 GMT+03:00, Konrad Dybcio <konrad.dybcio@somainline.org> wrote:
>
>
>On 15.09.2022 17:26, Dmitry Baryshkov wrote:
>> Correct firmware paths for the Sony Xperia Sagami devices to include the
>> SoC name.
>> 
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> ---
>>  .../arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>> 
>> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> index b3c9952ac173..e0940cb58681 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>> @@ -77,12 +77,12 @@ ramoops@ffc00000 {
>>  
>>  &adsp {
>>  	status = "okay";
>> -	firmware-name = "qcom/adsp.mbn";
>> +	firmware-name = "qcom/sdm8350/sagami/adsp.mbn";
>sm8350 ;)
>
>I think it would be cleaner to follow with what's currently in linux-firmware [1],
>so "qcom/socname/vendor/platform-or-device". Xperias have a single key per SoC, so
>per-platform is fine here. Should be the same for other vendors, but no guarantees.
>
>In this particular case, I think qcom/sm8350/SOMC/sagami would be appropriate, as
>it seems like SONY is still internally using that name [2] (SOny Mobile Communications)
>(sidenote: they are still using the legacy SEMC / Sony Ericsson Mobile
>Communications in some places if you dig deep enough :D), buuuut they can't seem
>to decide, might as well make it PlayStation at this point haha

I'd vote for plain Sony. Both SOMC and SEMC are non-obvious and too cryptic.

>
>
>Konrad
>
>[1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/qcom/sc8280xp/LENOVO
>[2] https://github.com/sonyxperiadev/kernel-copyleft-dts/blob/64.0.A.2.xxx/devicetree/qcom/waipio-nagara-pdx223_generic.dts#L10
>>  };
>>  
>>  &cdsp {
>>  	status = "okay";
>> -	firmware-name = "qcom/cdsp.mbn";
>> +	firmware-name = "qcom/sdm8350/sagami/cdsp.mbn";
>>  };
>>  
>>  &i2c1 {
>> @@ -175,12 +175,12 @@ &i2c17 {
>>  &ipa {
>>  	status = "okay";
>>  	memory-region = <&pil_ipa_fw_mem>;
>> -	firmware-name = "qcom/ipa_fws.mbn";
>> +	firmware-name = "qcom/sdm8350/sagami/ipa_fws.mbn";
>>  };
>>  
>>  &mpss {
>>  	status = "okay";
>> -	firmware-name = "qcom/modem.mbn";
>> +	firmware-name = "qcom/sdm8350/sagami/modem.mbn";
>>  };
>>  
>>  &pmk8350_rtc {
>> @@ -210,7 +210,7 @@ &qupv3_id_2 {
>>  
>>  &slpi {
>>  	status = "okay";
>> -	firmware-name = "qcom/slpi.mbn";
>> +	firmware-name = "qcom/sdm8350/sagami/slpi.mbn";
>>  };
>>  
>>  &spi14 {

-- 
With best wishes
Dmitry

Re: [RFC PATCH 1/7] arm64: qcom: dts: c630: correct firmware paths

[Steev Klimaszewski]

Hi Dmitry,

On 9/15/22 10:26 AM, Dmitry Baryshkov wrote:
> Correct firmware paths for the Lenovo Yoga C630 to include the SoC name.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>   arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> index be59a8ba9c1f..35d367bf97a4 100644
> --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
> @@ -94,7 +94,7 @@ backlight: backlight {
>   };
>   
>   &adsp_pas {
> -	firmware-name = "qcom/LENOVO/81JL/qcadsp850.mbn";
> +	firmware-name = "qcom/sdm850/LENOVO/81JL/qcadsp850.mbn";
>   	status = "okay";
>   };
>   
> @@ -306,7 +306,7 @@ vreg_lvs2a_1p8: lvs2 {
>   };
>   
>   &cdsp_pas {
> -	firmware-name = "qcom/LENOVO/81JL/qccdsp850.mbn";
> +	firmware-name = "qcom/sdm850/LENOVO/81JL/qccdsp850.mbn";
>   	status = "okay";
>   };
>   
> @@ -345,7 +345,7 @@ &gpu {
>   	status = "okay";
>   	zap-shader {
>   		memory-region = <&gpu_mem>;
> -		firmware-name = "qcom/LENOVO/81JL/qcdxkmsuc850.mbn";
> +		firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
>   	};
>   };
>   
> @@ -475,7 +475,7 @@ &mdss {
>   
>   &mss_pil {
>   	status = "okay";
> -	firmware-name = "qcom/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/LENOVO/81JL/qcdsp2850.mbn";
> +	firmware-name = "qcom/sdm850/LENOVO/81JL/qcdsp1v2850.mbn", "qcom/sdm850/LENOVO/81JL/qcdsp2850.mbn";
>   };
>   
>   &qup_i2c10_default {

Since this firmware comes from the Windows partitions for these 
machines, and I know there are a few installations out in the wild, this 
might break things for others - unlike the Thinkpad X13s which works 
"fine" (the battery won't charge if the adsp firmware isn't in place), 
iirc, the c630 doesn't boot properly without it?

That said, I've moved the firmware to the location above manually, and 
it does work so

Tested-by: Steev Klimaszewski <steev@kali.org>

Re: [RFC PATCH 5/7] arm64: qcom: dts: sagami: correct firmware paths

[Konrad Dybcio]

On 17.09.2022 22:33, Dmitry Baryshkov wrote:
> 
> 
> On 17 September 2022 16:07:13 GMT+03:00, Konrad Dybcio <konrad.dybcio@somainline.org> wrote:
>>
>>
>> On 15.09.2022 17:26, Dmitry Baryshkov wrote:
>>> Correct firmware paths for the Sony Xperia Sagami devices to include the
>>> SoC name.
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>> ---
>>>  .../arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 10 +++++-----
>>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>>> index b3c9952ac173..e0940cb58681 100644
>>> --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi
>>> @@ -77,12 +77,12 @@ ramoops@ffc00000 {
>>>  
>>>  &adsp {
>>>  	status = "okay";
>>> -	firmware-name = "qcom/adsp.mbn";
>>> +	firmware-name = "qcom/sdm8350/sagami/adsp.mbn";
>> sm8350 ;)
>>
>> I think it would be cleaner to follow with what's currently in linux-firmware [1],
>> so "qcom/socname/vendor/platform-or-device". Xperias have a single key per SoC, so
>> per-platform is fine here. Should be the same for other vendors, but no guarantees.
>>
>> In this particular case, I think qcom/sm8350/SOMC/sagami would be appropriate, as
>> it seems like SONY is still internally using that name [2] (SOny Mobile Communications)
>> (sidenote: they are still using the legacy SEMC / Sony Ericsson Mobile
>> Communications in some places if you dig deep enough :D), buuuut they can't seem
>> to decide, might as well make it PlayStation at this point haha
> 
> I'd vote for plain Sony. Both SOMC and SEMC are non-obvious and too cryptic.
Let's go with that then.

Konrad
> 
>>
>>
>> Konrad
>>
>> [1] https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/qcom/sc8280xp/LENOVO
>> [2] https://github.com/sonyxperiadev/kernel-copyleft-dts/blob/64.0.A.2.xxx/devicetree/qcom/waipio-nagara-pdx223_generic.dts#L10
>>>  };
>>>  
>>>  &cdsp {
>>>  	status = "okay";
>>> -	firmware-name = "qcom/cdsp.mbn";
>>> +	firmware-name = "qcom/sdm8350/sagami/cdsp.mbn";
>>>  };
>>>  
>>>  &i2c1 {
>>> @@ -175,12 +175,12 @@ &i2c17 {
>>>  &ipa {
>>>  	status = "okay";
>>>  	memory-region = <&pil_ipa_fw_mem>;
>>> -	firmware-name = "qcom/ipa_fws.mbn";
>>> +	firmware-name = "qcom/sdm8350/sagami/ipa_fws.mbn";
>>>  };
>>>  
>>>  &mpss {
>>>  	status = "okay";
>>> -	firmware-name = "qcom/modem.mbn";
>>> +	firmware-name = "qcom/sdm8350/sagami/modem.mbn";
>>>  };
>>>  
>>>  &pmk8350_rtc {
>>> @@ -210,7 +210,7 @@ &qupv3_id_2 {
>>>  
>>>  &slpi {
>>>  	status = "okay";
>>> -	firmware-name = "qcom/slpi.mbn";
>>> +	firmware-name = "qcom/sdm8350/sagami/slpi.mbn";
>>>  };
>>>  
>>>  &spi14 {
>