From 2279111cca4b1371138168f08990b10f3b8c6375 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sun, 17 May 2026 17:56:12 +0300 Subject: [PATCH] arm64: dts: qcom: kodiak: consolidate IPA properties Move generic IPA-related properties to the base DTSI file. The herobrine has special software configuration, so delete the memory-region property which wasn't set for it beforehand. Also delete the property for several IoT devices, which don't enable IPA memory at this point (and don't seem to have IPA supported by the modem firmware). Co-developed-by: Stanislav Zaikin Signed-off-by: Stanislav Zaikin Signed-off-by: Dmitry Baryshkov Reviewed-by: Alex Elder Link: https://lore.kernel.org/r/20260517-ipa-loader-v1-6-3c3764c1b4a3@oss.qualcomm.com Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/kodiak.dtsi | 3 +++ arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 3 +-- arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts | 2 -- arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 3 +-- arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 4 ++++ arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 4 ++++ arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 4 ++++ arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts | 3 --- arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts | 2 -- 10 files changed, 19 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/kodiak.dtsi b/arch/arm64/boot/dts/qcom/kodiak.dtsi index fa540d8c2615..781be681b9a3 100644 --- a/arch/arm64/boot/dts/qcom/kodiak.dtsi +++ b/arch/arm64/boot/dts/qcom/kodiak.dtsi @@ -2646,6 +2646,9 @@ ipa: ipa@1e40000 { qcom,smem-state-names = "ipa-clock-enabled-valid", "ipa-clock-enabled"; + qcom,gsi-loader = "self"; + memory-region = <&ipa_fw_mem>; + sram = <&ipa_modem_tables>; status = "disabled"; diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 04cb9230d29f..aa7c525237b9 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -913,9 +913,8 @@ &i2c9 { }; &ipa { - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; firmware-name = "qcom/qcm6490/fairphone5/ipa_fws.mbn"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts b/arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts index bf18c4852081..fef9fb51642d 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-particle-tachyon.dts @@ -501,8 +501,6 @@ &i2c1 { &ipa { firmware-name = "qcom/qcm6490/particle/tachyon/ipa_fws.mbn"; - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts index 797f37596bf1..1398a4dfb037 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts @@ -553,9 +553,8 @@ &i2c13 { }; &ipa { - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; firmware-name = "qcom/qcm6490/SHIFT/otter/ipa_fws.mbn"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts b/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts index bb5a42b038f1..6c1a73f18ec1 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts @@ -504,6 +504,10 @@ &i2c13 { status = "okay"; }; +&ipa { + /delete-property/ memory-region; +}; + &lpass_audiocc { compatible = "qcom,qcm6490-lpassaudiocc"; /delete-property/ power-domains; diff --git a/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts b/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts index a5ad796cb65d..7de63ee37a84 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts @@ -653,6 +653,10 @@ redriver_usb_con_sbu: endpoint { }; }; +&ipa { + /delete-property/ memory-region; +}; + &mdss { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts b/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts index f47efca42d48..e701cc39210f 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts @@ -774,6 +774,10 @@ lt9611_out: endpoint { }; }; +&ipa { + /delete-property/ memory-region; +}; + &lpass_audiocc { compatible = "qcom,qcm6490-lpassaudiocc"; /delete-property/ power-domains; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi index b721a8546800..ac89724ee099 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi @@ -22,7 +22,9 @@ mdata_mem: mpss-metadata { }; &ipa { + /delete-property/ memory-region; qcom,gsi-loader = "modem"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts b/arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts index 3c836e196b19..d94571c05a59 100644 --- a/arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts +++ b/arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts @@ -727,9 +727,6 @@ fsa4480_sbu_mux: endpoint { &ipa { firmware-name = "qcom/sm7325/motorola/dubai/yupik_ipa_fws.mbn"; - memory-region = <&ipa_fw_mem>; - - qcom,gsi-loader = "self"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts index cb59c122f6f6..7db9ae1c3cef 100644 --- a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts +++ b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts @@ -971,8 +971,6 @@ nfc@28 { }; &ipa { - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sm7325/nothing/spacewar/ipa_fws.mbn"; status = "okay";