From patchwork Mon Aug 2 23:30:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 490368 Delivered-To: patch@linaro.org Received: by 2002:a17:906:7d58:0:0:0:0 with SMTP id l24csp2398372ejp; Mon, 2 Aug 2021 16:30:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIyWPy6+7UCxo+q2JhRlJzUnnfNij4e80mPTmC9sB3bbZjeAMCd2oQky9SRk4f5opDNR4U X-Received: by 2002:aa7:db15:: with SMTP id t21mr22293770eds.261.1627947027411; Mon, 02 Aug 2021 16:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627947027; cv=none; d=google.com; s=arc-20160816; b=guSXO+L89snCPa2kTzYb20qj4+MazypQPsGxp+9DrhVKYVeTNLshT7+wRbRd4UgnGY zR0WshbQ6glv/oe5Lojo9Nr2A3ihvlz04F+koTgpQ9I/T4gYynuH86fd9mA4KtsgZNC/ EE+YJ63P5yX2HoedoA9VQ3ropRL3aSSXfUgojSFsMijA6bxpqPUJwXqMRLfBHGS+/oI5 qRei24m2CG5T5jkUV+hrgSgnJh+iE0DGu0IvWnWWB5BPkNLnGfBqJec8/GyONWitW6u1 I3gdhsqlXb0twymaDtFY9TrAU7A+UzZ6ktr4J0Tlngh//EmJH+oxLK39PMHNkyYlY7y5 x1Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wmjQVNSZtVohWFF+DxXEIMaU+MncLNjWBs6iyjh1uQ0=; b=QE+r+P8OsIWsrlmJ4IWamDM14QAuOnLQBxNcDv7RjxSCXrEjRLgyUzLC/GV6Svp8GJ y6cd0g6bZWfY6n8Y+eRdTy6wIug2BFfITnG2rGdhtBO6kFXwdYwkvT6T8gyJ9XmMpOLx 95SevtSlj5OkEmRyTECF79b7DMGQjqs1BabnzWnFX3xvb35ItGLmmxr4EqyGEM1FW9i2 GgARHnBux+PFIF6ZiNx/UAOkxyDCvCm6chWOScJoNP0KUR2zr8oO3bUMeak1y5lyt058 wcKkm7/KPOFUhafrevWtE8RrdG8WQii0OsjNWmDjT2pEj1ped8TXwWbihufsztOMLzzb tgBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fLGI5ysy; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i11si13907977edb.471.2021.08.02.16.30.27; Mon, 02 Aug 2021 16:30:27 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fLGI5ysy; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233312AbhHBXaf (ORCPT + 7 others); Mon, 2 Aug 2021 19:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233267AbhHBXae (ORCPT ); Mon, 2 Aug 2021 19:30:34 -0400 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 910B9C0613D5 for ; Mon, 2 Aug 2021 16:30:23 -0700 (PDT) Received: by mail-io1-xd35.google.com with SMTP id m13so22232414iol.7 for ; Mon, 02 Aug 2021 16:30:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wmjQVNSZtVohWFF+DxXEIMaU+MncLNjWBs6iyjh1uQ0=; b=fLGI5ysy2kb16zeHNWiYoBNA7qEUZyanhSU47oANOIh5KEiyJWypnWyuNcgLuevSmL Z+PDztWfXK4+xpK3mOvTT9F8swt+WmgEr+alzW7xHx/EpLgbu6AJCkTPYvGsFjriLt9U X3T0DwfI0qukLvvILVaJuQEVbeqpuS5zqaY2S7kW5qbeGwVjSobyIhjhMspkeb3+SKr9 w2dMLu5srTyX7JnD3X/3GZJNS1kEnsRnmWGm3jhpZU/HRRhjn5NWHRRkX4zdYoJfSIoC w5iO6WNcXf/3MGnEKbDSbqI5hLF0062/rpDY2PghSne6Af4acTdCS1D8AGTXTo2SRbDo smYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wmjQVNSZtVohWFF+DxXEIMaU+MncLNjWBs6iyjh1uQ0=; b=UII7at365H8lHiBPucmZC5xKkxeWff7037PkJNcsKYiml0S4sihxz34yG5+YWf21+9 F9pNdvF66Tge3UVJ7rKHkWf4Iub+yeQkitQ841O++8TaW8Nw4NI67hk+Ldt3GpaaBIEh RRrLCmFJ3tzzl7YXy7ShfdfOhrecVPsh7bSLX0vHdInVRkg0wlVg5g+YxzXgVXDFFjNk Q4yP/oYcq5QN2WFqRzNrFOBT9tCVjYrtImnh/E6gc4TTJQLkIjq7SHY25W4l2tcP44Jk m82+ZpbWlXd/DlKy7mIhDUHgrGI1jCRrrdMKr0v4tIRtC3BIarbfim5c7aKU3MywrUD0 uEIQ== X-Gm-Message-State: AOAM531PyzEWDSfSEHAnm51S+CBMbKsiydDFjg9ot/J84bKDSi5JBKWw m9+YvNak8D4du8IdHmO4VKTEVSx0XA1TZg== X-Received: by 2002:a02:5d0a:: with SMTP id w10mr16888339jaa.47.1627947022980; Mon, 02 Aug 2021 16:30:22 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id y17sm460883ilm.0.2021.08.02.16.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 16:30:22 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: robh+dt@kernel.org, bjorn.andersson@linaro.org, agross@kernel.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/1] Revert "Merge branch 'qcom-dts-updates'" Date: Mon, 2 Aug 2021 18:30:19 -0500 Message-Id: <20210802233019.800250-2-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210802233019.800250-1-elder@linaro.org> References: <20210802233019.800250-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This reverts commit b79c6fba6cd7c49a7dbea9999e182f74cca63e19, reversing these changes made to 0ac26271344478ff718329fa9d4ef81d4bcbc43b: commit 6a0eb6c9d934 ("dt-bindings: net: qcom,ipa: make imem interconnect optional") commit f8bd3c82bf7d ("arm64: dts: qcom: sc7280: add IPA information") commit fd0f72c34bd9 ("arm64: dts: qcom: sc7180: define ipa_fw_mem node") I intend for these commits to go through the Qualcomm repository, to avoid conflicting with other activity being merged there. Signed-off-by: Alex Elder --- .../devicetree/bindings/net/qcom,ipa.yaml | 18 ++++---- arch/arm64/boot/dts/qcom/sc7180.dtsi | 5 --- arch/arm64/boot/dts/qcom/sc7280.dtsi | 43 ------------------- 3 files changed, 8 insertions(+), 58 deletions(-) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 4853ab7017bd9..ed88ba4b94df5 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -87,18 +87,16 @@ properties: - const: ipa-setup-ready interconnects: - minItems: 2 items: - - description: Path leading to system memory - - description: Path between the AP and IPA config space - - description: Path leading to internal memory + - description: Interconnect path between IPA and main memory + - description: Interconnect path between IPA and internal memory + - description: Interconnect path between IPA and the AP subsystem interconnect-names: - minItems: 2 items: - const: memory - - const: config - const: imem + - const: config qcom,smem-states: $ref: /schemas/types.yaml#/definitions/phandle-array @@ -209,11 +207,11 @@ examples: interconnects = <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_EBI1>, - <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>, - <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>; + <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, + <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; interconnect-names = "memory", - "config", - "imem"; + "imem", + "config"; qcom,smem-states = <&ipa_smp2p_out 0>, <&ipa_smp2p_out 1>; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 7e0ff917e548c..a9a052f8c63c8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -110,11 +110,6 @@ tz_mem: memory@80b00000 { no-map; }; - ipa_fw_mem: memory@8b700000 { - reg = <0 0x8b700000 0 0x10000>; - no-map; - }; - rmtfs_mem: memory@94600000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x94600000 0x0 0x200000>; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index 5eb2b58ea23be..a8c274ad74c47 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -7,7 +7,6 @@ #include #include -#include #include #include #include @@ -64,11 +63,6 @@ cpucp_mem: memory@80b00000 { no-map; reg = <0x0 0x80b00000 0x0 0x100000>; }; - - ipa_fw_mem: memory@8b700000 { - reg = <0 0x8b700000 0 0x10000>; - no-map; - }; }; cpus { @@ -514,43 +508,6 @@ mmss_noc: interconnect@1740000 { qcom,bcm-voters = <&apps_bcm_voter>; }; - ipa: ipa@1e40000 { - compatible = "qcom,sc7280-ipa"; - - iommus = <&apps_smmu 0x480 0x0>, - <&apps_smmu 0x482 0x0>; - reg = <0 0x1e40000 0 0x8000>, - <0 0x1e50000 0 0x4ad0>, - <0 0x1e04000 0 0x23000>; - reg-names = "ipa-reg", - "ipa-shared", - "gsi"; - - interrupts-extended = <&intc 0 654 IRQ_TYPE_EDGE_RISING>, - <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, - <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; - interrupt-names = "ipa", - "gsi", - "ipa-clock-query", - "ipa-setup-ready"; - - clocks = <&rpmhcc RPMH_IPA_CLK>; - clock-names = "core"; - - interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>, - <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_IPA_CFG 0>; - interconnect-names = "memory", - "config"; - - qcom,smem-states = <&ipa_smp2p_out 0>, - <&ipa_smp2p_out 1>; - qcom,smem-state-names = "ipa-clock-enabled-valid", - "ipa-clock-enabled"; - - status = "disabled"; - }; - tcsr_mutex: hwlock@1f40000 { compatible = "qcom,tcsr-mutex", "syscon"; reg = <0 0x01f40000 0 0x40000>;