| Message ID | BY5PR02MB700966DEE6F6044EBEB5B892D91F9@BY5PR02MB7009.namprd02.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | efbd3599154cb3d947564a9dce419a6754d233ef |
| Headers | show |
| Series | [1/4] arm64: dts: qcom: sdm845-xiaomi-beryllium: change firmware path and use mbn format | expand |
On Wed, 30 Mar 2022 12:15:02 +0530, Joel Selvaraj wrote: > The "qcom/sdm845/" path conflicts with db845c's firmware that are > present in the linux-firmware package. Xiaomi uses their own signed > firmware for Poco F1 and can't use the db845c's firmware. So let's > use "qcom/sdm845/beryllium/" to distinguish Poco F1's firmware files. > > For easier handling and packaging, the mdt+bXX files are squashed > using Bjorn Andersson's pil-squasher tool from this link: > https://github.com/andersson/pil-squasher > > [...] Applied, thanks! [1/4] arm64: dts: qcom: sdm845-xiaomi-beryllium: change firmware path and use mbn format commit: efbd3599154cb3d947564a9dce419a6754d233ef [2/4] arm64: dts: qcom: sdm845-xiaomi-beryllium: enable qcom ipa driver commit: 84b6c2420415767079baa24ffd70d048cd35bdd8 [3/4] arm64: dts: qcom: sdm845-xiaomi-beryllium: fix typo in panel's vddio-supply property commit: 1f1c494082a1f10d03ce4ee1485ee96d212e22ff [4/4] arm64: dts: qcom: sdm845-xiaomi-beryllium: enable second wifi channel commit: 3213b3741a147db59ed6f1ebc5f569854725b91f Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts index 367389526b41..27ba9ad1ad02 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts @@ -121,7 +121,7 @@ vreg_s4a_1p8: vreg-s4a-1p8 { &adsp_pas { status = "okay"; - firmware-name = "qcom/sdm845/adsp.mdt"; + firmware-name = "qcom/sdm845/beryllium/adsp.mbn"; }; &apps_rsc { @@ -208,7 +208,7 @@ vreg_l26a_1p2: ldo26 { &cdsp_pas { status = "okay"; - firmware-name = "qcom/sdm845/cdsp.mdt"; + firmware-name = "qcom/sdm845/beryllium/cdsp.mbn"; }; &dsi0 { @@ -262,7 +262,7 @@ &gpu { zap-shader { memory-region = <&gpu_mem>; - firmware-name = "qcom/sdm845/a630_zap.mbn"; + firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn"; }; }; @@ -289,7 +289,7 @@ &mdss { &mss_pil { status = "okay"; - firmware-name = "qcom/sdm845/mba.mbn", "qcom/sdm845/modem.mdt"; + firmware-name = "qcom/sdm845/beryllium/mba.mbn", "qcom/sdm845/beryllium/modem.mbn"; }; &pm8998_gpio {
The "qcom/sdm845/" path conflicts with db845c's firmware that are present in the linux-firmware package. Xiaomi uses their own signed firmware for Poco F1 and can't use the db845c's firmware. So let's use "qcom/sdm845/beryllium/" to distinguish Poco F1's firmware files. For easier handling and packaging, the mdt+bXX files are squashed using Bjorn Andersson's pil-squasher tool from this link: https://github.com/andersson/pil-squasher Signed-off-by: Joel Selvaraj <jo@jsfamily.in> --- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)