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@xxxxxxxxxx>
> ---
> .../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 {
