From patchwork Sat Dec 31 00:27:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 13085125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2AE5C3DA7D for ; Sat, 31 Dec 2022 00:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235927AbiLaA1X (ORCPT ); Fri, 30 Dec 2022 19:27:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235817AbiLaA1W (ORCPT ); Fri, 30 Dec 2022 19:27:22 -0500 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 712971E3FE for ; Fri, 30 Dec 2022 16:27:21 -0800 (PST) Received: by mail-il1-x135.google.com with SMTP id c20so8315956ilj.10 for ; Fri, 30 Dec 2022 16:27:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5eqU7JgWl4dJVjguwaLq4WB7+jzDfq4wubcJKGAoN4w=; b=kgdmWFZUa8sixWzA+A7G1gfSz69e5PpnfVf8GKUDUCs7tLlaN0/Ftk2Q/CBIB1XX5J tzB905s27qsKME0pYRYuPtnM5/RPVzR3bLa9EhSbn2/A9O9jE4zboN7VjAG6Tbsc3YJj YOfZOE+cTiC2CDth/8pJXLswxfZvTMDQenI7ngYD6wPlKVwI87sgiu+99uyStIlH23Pi OdOUWrwHdDHLSeEuG+BK7pR/G5/42XeVMAQaX8NKaLH/yPjXNrrDAG2CUAn6cF11agKm Go2NT6+2YDpMIlcVrlAC0otg1gATClObTHrtOWkkEagW/+BHWX2njvJ5EMuil0U6kZKl NyFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5eqU7JgWl4dJVjguwaLq4WB7+jzDfq4wubcJKGAoN4w=; b=e81LOgbXoah5109e7IzRLfFCy4gARluhmb/qmcTPKBAizTv2Gz0AYje5BGcc1I/4sX 9guZPG6pJHOYgZXxIp/RYNYaiqzrWrVEh34PtTL5gYtbJekPKAVnJxIqPZTqWwqz4/8r +qutqfa3zHOlXaSm0Ak91QWyJjtFDgpEH9GC6VT6UBfdDkok8eS3fV+l/UX6u/xxr0eG ESTtK3gjTyB2r8viNFp/yIrt6jMe1ECWr42+9ckgY1S7+f3PMXe8hikbI9cRhYB3yxQ2 Beyp4UTzd/gjiJMfuZ60dOqUxDgdn/i0FFHLueP2WtKJonTdN8fP49P+1OuDi14+BwbR nQmg== X-Gm-Message-State: AFqh2kpUgOSv6I6hcc2O2KLmuVf2GcNNEvMMS1qL4PHhmFgtryp9cHQU Kt3WbXMFD3R2YxZFjc3fHOj3LA== X-Google-Smtp-Source: AMrXdXvX9DZJDImVz3L1Csjbzux4PXcPmnVN98uC4JbGl8dLXSmnhwnzpZcCSB0bvk/Np6PHazEO8A== X-Received: by 2002:a92:8e13:0:b0:302:f953:4637 with SMTP id c19-20020a928e13000000b00302f9534637mr22058513ild.26.1672446440817; Fri, 30 Dec 2022 16:27:20 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id t4-20020a922c04000000b002f9f7d24d78sm6969279ile.76.2022.12.30.16.27.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 16:27:20 -0800 (PST) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, andersson@kernel.org, konrad.dybcio@linaro.org, agross@kernel.org Cc: caleb.connolly@linaro.org, mka@chromium.org, evgreen@chromium.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: qcom: use qcom,gsi-loader for IPA Date: Fri, 30 Dec 2022 18:27:15 -0600 Message-Id: <20221231002716.2367375-2-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221231002716.2367375-1-elder@linaro.org> References: <20221231002716.2367375-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Depending on the platform, either the modem or the AP must load GSI firmware for IPA before it can be used. To date, this has been indicated by the presence or absence of a "modem-init" property. That mechanism has been deprecated. Instead, we indicate how GSI firmware should be loaded by the value of the "qcom,gsi-loader" property. Update all ARM platforms that use IPA to use the "qcom,gsi-loader" property to specify how the GSI firmware is loaded. Update the affected nodes so the status property is last. Signed-off-by: Alex Elder Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom-sdx55-t55.dts | 4 ++-- arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom-sdx55-t55.dts b/arch/arm/boot/dts/qcom-sdx55-t55.dts index 7ed8feb99afbe..61ac5f54cd57d 100644 --- a/arch/arm/boot/dts/qcom-sdx55-t55.dts +++ b/arch/arm/boot/dts/qcom-sdx55-t55.dts @@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &qpic_bam { diff --git a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts index ac8b4626ae9ac..c9c1f7da1261b 100644 --- a/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts +++ b/arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts @@ -237,9 +237,9 @@ &blsp1_uart3 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &pcie0_phy { From patchwork Sat Dec 31 00:27:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 13085126 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B557C5479D for ; Sat, 31 Dec 2022 00:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235695AbiLaA1Y (ORCPT ); Fri, 30 Dec 2022 19:27:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235932AbiLaA1X (ORCPT ); Fri, 30 Dec 2022 19:27:23 -0500 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88D7B1EAC7 for ; Fri, 30 Dec 2022 16:27:22 -0800 (PST) Received: by mail-il1-x12e.google.com with SMTP id g2so8970104ila.4 for ; Fri, 30 Dec 2022 16:27:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XU58kPYl9n82LN59dtODH7bg7cp4BHh6YJsgbAZI+Ks=; b=t33hWfZzTekkZPTFN2v5aPWvOuFLfga2yWC4R7FZG8dbJx7MhhspkKC7sJuV91HXqT Kj0ycqZbQ4hEI5eJCuElLowh9uqaq0CodlclWiDUxMDqRRtaUt3/9C10f/QdXOlPRNZ3 vbVPBopwb1/J8mSRK2UwHSgay1yNWNw8mHbX1OyJuf5pB3cfbDnsZzoEKE91UicPM4RL zCXVkJ9ntM1DKfm1dPzhMwYAt6xABnuSX7jBuqRUB/xETiblYVOTozLdHcpHSHt57ldB 9Vrf98DgKz6EFdjcn9NUPEPTqNJjNcKqDTfXqQKUwvnLGJ3gPUxRk47EGNmagTKUeNP5 Qc9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XU58kPYl9n82LN59dtODH7bg7cp4BHh6YJsgbAZI+Ks=; b=Mv917oL72bfQQ3RpXzdPKbVJpdHj9wtqjkHdnYc5K1vwUBeSHAxSAj11ARMe3QMicm Podq2ChS3Z2isxpaw63gZtiKDaBxOnxZVA5AE0GRuzlI6X58WBZSkJGO0xde0vFRyNE3 chDbT4nze5GFL87s5E9oYqlml/854xhb+qKhEjGNUbplV+tF+4YTBXWdvzE7n1dGkvwQ r26UU05exgmdYB9XrUoG7NHvYTMeki2Q6QuayFWcxl1GDdS5RBW/gorJ7fbWGF7Zadxo cBloUy/U8ik/BXbCSsGB+CeovhTBRc9mZjBLMSznwZ6za6Z4+2RGXQ4M5alUgoqVytcN /9cw== X-Gm-Message-State: AFqh2krhxCfiFKA0tl93svzrjK8w6rRYo4hsASVdoeIoD5rw0InxDLUs OZCQdbX1t+RzvSWy6ShyeOZKDw== X-Google-Smtp-Source: AMrXdXvlUHSbyBgmovCj8d/Gsd+ikI6F8/sKZNwvtCWADE61C7G94gt6YYrfNdLgtRqs5HeMKAZj+g== X-Received: by 2002:a92:d950:0:b0:30c:2ff1:c8d7 with SMTP id l16-20020a92d950000000b0030c2ff1c8d7mr2910385ilq.0.1672446441882; Fri, 30 Dec 2022 16:27:21 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id t4-20020a922c04000000b002f9f7d24d78sm6969279ile.76.2022.12.30.16.27.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Dec 2022 16:27:21 -0800 (PST) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, andersson@kernel.org, konrad.dybcio@linaro.org, agross@kernel.org Cc: caleb.connolly@linaro.org, mka@chromium.org, evgreen@chromium.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: use qcom,gsi-loader for IPA Date: Fri, 30 Dec 2022 18:27:16 -0600 Message-Id: <20221231002716.2367375-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221231002716.2367375-1-elder@linaro.org> References: <20221231002716.2367375-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Depending on the platform, either the modem or the AP must load GSI firmware for IPA before it can be used. To date, this has been indicated by the presence or absence of a "modem-init" property. That mechanism has been deprecated. Instead, we indicate how GSI firmware should be loaded by the value of the "qcom,gsi-loader" property. Update all arm64 platforms that use IPA to use the "qcom,gsi-loader" property to specify how the GSI firmware is loaded. Update the affected nodes so the status property is last. Signed-off-by: Alex Elder Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 ++--- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 3 ++- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 4 ++-- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 3 ++- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 + arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 3 ++- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 ++- arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 4 ++-- arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 ++- 15 files changed, 25 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi index fd4b712037542..bffcbd141bd7c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi @@ -19,12 +19,11 @@ &remoteproc_mpss { }; &ipa { - status = "okay"; - /* * Trogdor doesn't have QHEE (Qualcomm's EL2 blob), so the * modem needs to cover certain init steps (GSI init), and * the AP needs to wait for it. */ - modem-init; + qcom,gsi-loader = "modem"; + status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index f7efb9966afd1..5ad97cd5f1b75 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -377,8 +377,8 @@ &gpi_dma1 { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_cpu { diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi index df49564ae6dc1..6d80c64097e97 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi @@ -337,8 +337,8 @@ vreg_bob: bob { /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpass_va_macro { diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index ca676e04687b0..c194a88f91fd1 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi @@ -756,8 +756,8 @@ &gpu { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &lpasscc { diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi index 1eb423e4be24c..b62beffc27bf7 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -474,8 +474,8 @@ zap-shader { }; &ipa { + qcom,gsi-loader = "modem"; status = "okay"; - modem-init; }; &mss_pil { diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index de2d10e0315af..f5a186fd7c72b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -518,8 +518,9 @@ &i2c10 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi index 42cf4dd5ea284..d8a601d36c6df 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -424,10 +424,10 @@ rmi4_f12: rmi4-f12@12 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/oneplus6/ipa_fws.mbn"; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index bb77ccfdc68c0..fcd401f460456 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -495,10 +495,10 @@ touchscreen@38 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/axolotl/ipa_fws.mbn"; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index eb6b2b676eca4..d6b11d56ebb37 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -299,9 +299,10 @@ &mss_pil { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/beryllium/ipa_fws.mbn"; + status = "okay"; }; &pm8998_gpio { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 38ba809a95cd6..9ca4682aea1b2 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -449,6 +449,7 @@ &ibb { }; &ipa { + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm845/polaris/ipa_fws.mbn"; status = "okay"; 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 f32b7445f7c96..15da94808b21d 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -465,8 +465,9 @@ ecsh: hid@5c { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; + status = "okay"; }; &mdss { diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index daca1e0ad62ad..15f6059b75757 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -383,9 +383,10 @@ digitizer@9 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&ipa_fw_mem>; firmware-name = "qcom/sdm850/samsung/w737/ipa_fws.elf"; + status = "okay"; }; /* No idea why it causes an SError when enabled */ diff --git a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts index 9c4cfd995ff29..00f16cde6c4ac 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-microsoft-surface-duo2.dts @@ -290,9 +290,9 @@ &i2c11 { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; &mpss { diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts index 52cf3045602f9..f70e0de0509c5 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts @@ -376,7 +376,7 @@ &usb_2_qmpphy { }; &ipa { - status = "okay"; - + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; + status = "okay"; }; 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 1f2d660f8f86c..d00e8d922ceeb 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi @@ -524,9 +524,10 @@ &i2c17 { }; &ipa { - status = "okay"; + qcom,gsi-loader = "self"; memory-region = <&pil_ipa_fw_mem>; firmware-name = "qcom/sm8350/Sony/sagami/ipa_fws.mbn"; + status = "okay"; }; &mpss {