From patchwork Thu Dec 15 22:45:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 634553 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 BE2A2C4332F for ; Thu, 15 Dec 2022 22:46:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229882AbiLOWp7 (ORCPT ); Thu, 15 Dec 2022 17:45:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiLOWp6 (ORCPT ); Thu, 15 Dec 2022 17:45:58 -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 B3A271B7AA for ; Thu, 15 Dec 2022 14:45:56 -0800 (PST) Received: by mail-il1-x135.google.com with SMTP id d14so409977ilq.11 for ; Thu, 15 Dec 2022 14:45:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7CZ2EBCo0xYEovV/05sNJzYR16hADn5kVh9KkAARs/k=; b=x1EKv81x/3zfu9V6uyYNl/SQqVouSk+UJpdqo3Oq1nq3+bYK4y1/cxelf/Kygm1YQM 9mUISnkvpzlPP2jHWr/JbUFwGIiQzrWj0te+1QJGcRBHAcL+E96WXrdcLsaU0XJzCFcq pEFYru7/Mj4udz19j+rqNNr227dIhKqVc2GYmQb4zpyCwJ02ndVRKsNGtRuSe8OZLkA+ VRpeJ4piCQltm11Af9MyWpuLz43Tyluo4SNHDqwmQJSJzBMTQUCQU44m6znTkqTLBAoL i7kInRCknVs/jR2KpQWtDsdk2PLHY/rNc1cBL1VnacMPxzn7IkL/3euVByfLp6/kLJsk 5aSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7CZ2EBCo0xYEovV/05sNJzYR16hADn5kVh9KkAARs/k=; b=DDl4b5IDZ0SxyXJhoZwaDzgDuTWSbeSohFQMNDWgCZ82WHcaYhGmGlzOY+k8mkOjRK nHVhx2jsA+VzN7OfxEPPrxazioGLrgwVFuoqoPcGQBk78JRjy/JUsbkvW4YVYt+S1AiG qTzFK7G2kax4VePT0hgbu6nCV7w3xCKaNPrt48+H/1qyt1QP4BgbHsf0wiHw8aTut+h5 rUQbApaiC6IqQff6KmKT4P7Jqi4MbuSYJVBoegQlM4Y+TNl489Lsb8e/ApfcMZeNzW9/ 54wz5v3BPmOPAo1vxubDUvEi7QhEFfx9MfX8jj6CK3zKSuZsfzGPLQkagT5d/zwrSoBg tGGA== X-Gm-Message-State: ANoB5pkBmihQQnQrddYe/5eYcjuWKTvwgGzDiLeGd6sSsBmI4yD0+CmJ oq9Hkh0/r+Eom/xGANFof5JDgw== X-Google-Smtp-Source: AA0mqf52xsULVw+BOtQr6mDp3WEcaTpKZBi3MtA79cAMrji1R+o2I9qDZw2jiCUHTxpMxOcd8gYPnA== X-Received: by 2002:a05:6e02:1d96:b0:303:85e0:1ff6 with SMTP id h22-20020a056e021d9600b0030385e01ff6mr26237258ila.6.1671144355916; Thu, 15 Dec 2022 14:45:55 -0800 (PST) Received: from localhost.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id e24-20020a02a798000000b00374cd28d842sm186101jaj.104.2022.12.15.14.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 14:45:55 -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: quic_sibis@quicinc.com, elder@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] arm64: dts: qcom: sc7280: enable IPA in sc7280-herobrine-lte-sku.dtsi Date: Thu, 15 Dec 2022 16:45:52 -0600 Message-Id: <20221215224552.1232449-1-elder@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org IPA is only needed on a platform if it includes a modem, and not all SC7280 SoC variants do. The file "sc7280-herobrine-lte-sku.dtsi" is used to encapsulate definitions related to Chrome OS SC7280 devices where a modem is present, and that's the proper place for the IPA node to be enabled. Currently IPA is enabled in "sc7280-idp.dtsi", which is included by DTS files for Qualcomm reference platforms (all of which include the modem). That also includes "sc7280-herobrine-lte-sku.dtsi", so enabling IPA there would make it unnecessary for "sc7280-idp.dtsi" to enable it. The only other place IPA is enabled is "sc7280-qcard.dtsi". That file is included only by "sc7280-herobrine.dtsi", which is (eventually) included only by these top-level DTS files: sc7280-herobrine-crd.dts sc7280-herobrine-herobrine-r1.dts sc7280-herobrine-evoker.dts sc7280-herobrine-evoker-lte.dts sc7280-herobrine-villager-r0.dts sc7280-herobrine-villager-r1.dts sc7280-herobrine-villager-r1-lte.dts All of but two of these include "sc7280-herobrine-lte-sku.dtsi", and for those cases, enabling IPA there means there is no need for it to be enabled in "sc7280-qcard.dtsi". The two remaining cases will no longer enable IPA as a result of this change: sc7280-herobrine-evoker.dts sc7280-herobrine-villager-r1.dts Both of these have "lte" counterparts, and are meant to represent board variants that do *not* have a modem. This is exactly the desired configuration. Signed-off-by: Alex Elder Reviewed-by: Sibi Sankar Tested-by: Sibi Sankar Reviewed-by: Douglas Anderson --- v2: Moved &ipa node update earlier, and status property to end arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 5 ----- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) 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 ad66e5e9db4ed..c5309b25d0860 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi @@ -20,6 +20,11 @@ mba_mem: memory@9c700000 { }; }; +&ipa { + modem-init; + status = "okay"; +}; + &remoteproc_mpss { compatible = "qcom,sc7280-mss-pil"; iommus = <&apps_smmu 0x124 0x0>, <&apps_smmu 0x488 0x7>; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index f7efb9966afd1..0ddbe7f732bd9 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -376,11 +376,6 @@ &gpi_dma1 { status = "okay"; }; -&ipa { - status = "okay"; - modem-init; -}; - &lpass_cpu { status = "okay"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi index df49564ae6dc1..cd6ee84b36fd4 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi @@ -336,11 +336,6 @@ vreg_bob: bob { /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ -&ipa { - status = "okay"; - modem-init; -}; - &lpass_va_macro { vdd-micb-supply = <&vreg_bob>; };