From e60ad1f5206bc8029c0b087846e12c715792b201 Mon Sep 17 00:00:00 2001 From: Joe Sandom Date: Mon, 20 Apr 2026 10:13:15 +0100 Subject: [PATCH] arm64: dts: qcom: sm8550: move IPA properties to SoC device tree Move qcom,gsi-loader and memory-region properties from individual board DTS files into the SoC DTSI, since these are common to all SM8550-based boards. Reviewed-by: Dmitry Baryshkov Signed-off-by: Joe Sandom Link: https://lore.kernel.org/r/20260420-rb5gen2-dts-v4-3-b461909c2de8@axon.com Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 2 -- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 2 -- arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts index e821b731bdc4..b79558938552 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts @@ -939,8 +939,6 @@ &i2c_master_hub_0 { }; &ipa { - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sm8550/ipa_fws.mbn"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index cf63109ff7bf..f2effa55d819 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -818,8 +818,6 @@ fsa4480_sbu_mux: endpoint { }; &ipa { - qcom,gsi-loader = "self"; - memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sm8550/ipa_fws.mbn"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index aee4947fe70e..83136efb7724 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -3091,6 +3091,8 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, 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";