From patchwork Sat Dec 24 00:21:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 637049 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 D95EBC4332F for ; Sat, 24 Dec 2022 00:21:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231127AbiLXAVb (ORCPT ); Fri, 23 Dec 2022 19:21:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230193AbiLXAVb (ORCPT ); Fri, 23 Dec 2022 19:21:31 -0500 Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3715D10FEC for ; Fri, 23 Dec 2022 16:21:30 -0800 (PST) Received: by mail-il1-x12d.google.com with SMTP id z18so3165845ils.3 for ; Fri, 23 Dec 2022 16:21:30 -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=ho+2OT1cU7+wj0oYRnyuh0fOK7IL6ZBjbwYcTjcTdno=; b=AyiY51eZhjTqZRG99hBVw6wwzSDUx43zUw7FN0Uzj5vXJTDwLz8Tta5aVy3ElXlLz6 P6/So66wT8hTKZYIENEHkvZ/2cxahmTyth4W4b1y4KM9lCTk6jD+qnNPECtGWsRj9uOC UBa50bMx8KAnSiXE0wN4GpkwJeynSJ+25K60zUGB7j0BBt34SotpDT0pS0oIllaJraW6 5t2ZNzcvPS53rcc1i4j9ThDNcb8TuWruMHdtD49d9ywLHz+Nc/fqdsC8KElZYiqFOCjM ZPevv+k+vHATA5sxtmn7zTixMRlTYvFsHl4Jsg46yIjwvpvqHpbmYzW4TKbpjC5nghcK JVAQ== 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=ho+2OT1cU7+wj0oYRnyuh0fOK7IL6ZBjbwYcTjcTdno=; b=I/pjVz7Yc+3sgjIE5ZpPqGovkAn1sKqzSP4XRKL0Z9vU2E+LC3GQQLIovOUuE6xcH/ xhjhKTyFWXnU5UUmexzmq8ydaJQrogsCxYYoEMVlFBUwyT9r064lvBQgi+9i5zzkF1DL 9Y5M91y9GP4EUwVjxYw8NOL5ZUXow3GiQBmw16kd2gQZAYs1ClQH45DNlb2XsZ6SJM+6 1GdrXq4lze5mHTOQpsGEFJbu2kgt0iKxH9mfp5iR97fGiYt48dT3plgoK50YuEVlkTl6 3/iYlTIaFl6g4o4ytIdxCJBTzuJK/HYXrBbGkGi2M2D0hSXLDimXqeDKEaAWF9wcz8lN blbA== X-Gm-Message-State: AFqh2kraETUaBYl5ZlPY+SDqKPd01fU79WrlP3MM1MwnLMZ/uqDZTEcu XXQN6YY/V5rm213jXjm3wibs4Q== X-Google-Smtp-Source: AMrXdXu1eLtbh7BBL6jqdRe+hyXD7o6lzlMV3Vy0CczN8IOLP7VsHnIIaZ2IBk2nRvGOQXrIBleS+Q== X-Received: by 2002:a05:6e02:1246:b0:303:2d1e:f28c with SMTP id j6-20020a056e02124600b003032d1ef28cmr6928313ilq.24.1671841289495; Fri, 23 Dec 2022 16:21:29 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id x39-20020a0294aa000000b0038a0182e0casm1381189jah.11.2022.12.23.16.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Dec 2022 16:21:29 -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, mka@chromium.org, dianders@chromium.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] arm64: dts: qcom: sc7280: only enable IPA for boards with a modem Date: Fri, 23 Dec 2022 18:21:26 -0600 Message-Id: <20221224002126.1518552-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: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- v3: Rewrote the subject line as suggested by Matthias 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>; };