From patchwork Fri Jul 21 13:54:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705026 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 D154FEB64DD for ; Fri, 21 Jul 2023 13:54:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231223AbjGUNyZ (ORCPT ); Fri, 21 Jul 2023 09:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230403AbjGUNyY (ORCPT ); Fri, 21 Jul 2023 09:54:24 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8D3C2D45 for ; Fri, 21 Jul 2023 06:54:21 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2b9352ff1aeso29467331fa.1 for ; Fri, 21 Jul 2023 06:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947660; x=1690552460; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0yB40CTk1VoTOsNL9APWuoijg9dwI6heid/caMKUcao=; b=aAP8VECYu92wrobOqBpBNpmIFUNvAR/nfnMU/88jDpJKWa3Ww5LXfd5ktC0tPSLrGW iMumOseowq/MGRZQx9mJyhhWn7qKvT4o5uuOyNpANEvqDvdOVny4KFMyIL3qgMicm0LL 5NooRLEEvvVvCJVVdYj/V8JxEiS4HGfWuRlNp2dAs8Qve3UFUVtwTiarrn0N1I2xJbHq o2LFoSX1oj62yCRG2ebJuoNnwvQ2LI/YL00gv41F447gUBjdsO8NDiTJYA/0Ooev9LZH A5Ny9yPdK9ZZhpAHsLD7HKn3DI5p7EGikeRIr4YOPeCmBv+60AaSAGBZqAPjgxPqmKNT 0+Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947660; x=1690552460; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0yB40CTk1VoTOsNL9APWuoijg9dwI6heid/caMKUcao=; b=LiYblOa6kiz+CxfFCO96eJ3RnLSajt4gJmQqRog7mrUl9X1xc6ftzyofJyYXiX2Gn9 uTob8/2EAyrCax4YTAnUMbbZRh3F4i4So7eiLLMmd1D9WPtEozwGHz9odyZ6Vqusn0G8 Zs7+h/fctApi12W6LjiJ5FWckKH9neXbxnfrVPO7rsZwwMLlFYWGN/1VKOdjFjVSjqpn 5qtpYz3tj7as0SgugU3iCv2iuhDqxvvL5yFqo6Pq62wSJ6cavOWFJyFLnmOpk0giTi5A jE93rS9qhtihhBfW6h1ZVLOHhx8l43VjGEhUoYH8MTkHW2BExHs3WHfI1DMKlJGKYhkL y+Gg== X-Gm-Message-State: ABy/qLYe1+0wHjfZT1l472r1trpYnpyqDFLEbOgbKM6rAd7roFJitvpD i/HkMIZ54zozaJ3fa3/qWsTVcQ== X-Google-Smtp-Source: APBJJlGvkGZ/eyJkBvEou8GLjCQESQdZgHtDY77OX6Fy01FgYk9HeTVo069nE1Cr0QUryqUXJy+HUw== X-Received: by 2002:a2e:900e:0:b0:2b7:2066:10e1 with SMTP id h14-20020a2e900e000000b002b7206610e1mr1637876ljg.0.1689947659814; Fri, 21 Jul 2023 06:54:19 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:19 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:11 +0200 Subject: [PATCH 1/7] dt-bindings: interconnect: qcom: Introduce qcom,rpm-common MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-1-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=2578; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=nt1uBTOFn8HFHfToq9UbMDlyE9rJBF2MRr2jYaL8rVE=; b=YW5UEXDZFzVDW25hRSpv9KuzN4kQ6FywinJcWBIdsWF5IvuCOboqsdl/8XMI/+GjWYLlm0Mmy qZAGcUsX4SdDsL7ibPIbgcCmmrFR5U2B6zjPbzNTw1kqEuo1FOBAhM0 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The current RPM interconnect bindings are messy. Start cleaning them up with a common include. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,qcm2290.yaml | 12 +++------ .../bindings/interconnect/qcom,rpm-common.yaml | 31 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml index f65a2fe846de..edee78c456b7 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml @@ -13,19 +13,16 @@ description: | The Qualcomm QCM2290 interconnect providers support adjusting the bandwidth requirements between the various NoC fabrics. -properties: - reg: - maxItems: 1 +allOf: + - $ref: qcom,rpm-common.yaml# +properties: compatible: enum: - qcom,qcm2290-bimc - qcom,qcm2290-cnoc - qcom,qcm2290-snoc - '#interconnect-cells': - const: 1 - clock-names: items: - const: bus @@ -75,11 +72,10 @@ patternProperties: required: - compatible - reg - - '#interconnect-cells' - clock-names - clocks -additionalProperties: false +unevaluatedProperties: false examples: - | diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm-common.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm-common.yaml new file mode 100644 index 000000000000..87995b40a856 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm-common.yaml @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,rpm-common.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm RPMh Network-On-Chip Interconnect + +maintainers: + - Konrad Dybcio + +description: + RPM interconnect providers support for managing system bandwidth requirements + through manual requests based on either predefined values or as indicated by + the bus monitor hardware. Each provider node represents a NoC bus master, + driven by a dedicated clock source. + +properties: + reg: + maxItems: 1 + + '#interconnect-cells': + oneOf: + - const: 2 + - const: 1 + deprecated: true + +required: + - '#interconnect-cells' + +additionalProperties: true From patchwork Fri Jul 21 13:54:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705358 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 804B3EB64DC for ; Fri, 21 Jul 2023 13:54:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231374AbjGUNy0 (ORCPT ); Fri, 21 Jul 2023 09:54:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjGUNyZ (ORCPT ); Fri, 21 Jul 2023 09:54:25 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF06C2D4D for ; Fri, 21 Jul 2023 06:54:23 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2b7441bfa9eso25393451fa.0 for ; Fri, 21 Jul 2023 06:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947662; x=1690552462; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1VLbg2b/AEZY+CpuEE45WzrxrUPycHTxVLLWXFR6z5c=; b=rYnvfj929aqdUDB2SRfkoyM5MWZZuy1qjxUfTZZN1bV+c2CwLWJOcVAtQmOykgORek eZd/ZOKrJci+JHABfGoT1L9FroACMh4QzcQRQAkOx86yDiZBSGxKWZ1DwiC07WrkujQ9 F87+5cQbxbtzi9ZGPkNpVz/YfYzp1YE4/QnnxR14ivN7N0vy45YlIN2C832cvdGLqR6S 7/aDORKb+G4hMSuQ4/mxgV6q5H48XI3P/PFFK5TBzjvkXFkM3KWvEczdNlmveFThD8Fl 1Y/220Nvu9v9rhmEkgucqsdwLxdVXJh3J0/ijDqI5L9LQ1ixevvkUrSjq/nOzz86X2Sr kFeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947662; x=1690552462; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1VLbg2b/AEZY+CpuEE45WzrxrUPycHTxVLLWXFR6z5c=; b=GW0/FonAY78sZ5bQc8SFL4G2LfgSuxYeFtyGhwmISW2vl4utq1vAS0hx6vD8XU0OvL hzSQ/P4V41mZ3McsGn6ElEPlrcUwiorMPtD++4RfRx62u2EVwJhoyxpMRVzmDv+m2/9s 76v3/qzylFFWdd319s7XwciCzMuFRGFYH1yqRXPKhcwWnyJNT9Nlna9PlC72zbr+WiVE drCov8IZK9F/sp7qMbFwo3NF0zT1M+uMWil78k2UbTfnurkLODnCqI1Y3cPLW/HtGbZs LxDcMF5jmWVPvjNGgBWM6pW58DvMwzezwa9tTvYO4xCI/BLWMajStxuhhRQvXMaWkJCf uhew== X-Gm-Message-State: ABy/qLZ7JsVyleVV0OcEb2y3648XX4B2em2fxTpsPYTzRHh3kcvv8G+6 wl1i3VjDEqJquIGV6pvHcNwNnw== X-Google-Smtp-Source: APBJJlGYtxhxf5JQq0t2V9uDd+Q9B+uEyPzcSmXbhylhG6MFUiKS+aQLEnqouyH+/dZG6ITVTsP/aA== X-Received: by 2002:a2e:b80e:0:b0:2b6:fdae:903a with SMTP id u14-20020a2eb80e000000b002b6fdae903amr2025525ljo.5.1689947661752; Fri, 21 Jul 2023 06:54:21 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:21 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:12 +0200 Subject: [PATCH 2/7] dt-bindings: interconnect: qcom: qcm2290: Remove RPM bus clocks MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-2-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=3313; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=BjBFVhQOBh5m/NVyCaKDcFbNtwPK65Qu/CW9fU3ga2k=; b=2i4+8jv+GvAD8/EyZiI8TwCpNDtsJVcooMbSRUnvNtfXn9m6sEbwqMd2I7Ulou9l/KvLaXDLO H8/5ChQIGQGAF8W3b80W/SDcs0S4DbvWZERInCEzKGVtZYzCaLOHnmL X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org After the recent reshuffling, bus clocks are no longer exposed as RPM clocks. Remove the old description. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,qcm2290.yaml | 42 ---------------------- 1 file changed, 42 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml index edee78c456b7..d2a36bec97c2 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,qcm2290.yaml @@ -23,16 +23,6 @@ properties: - qcom,qcm2290-cnoc - qcom,qcm2290-snoc - clock-names: - items: - - const: bus - - const: bus_a - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - # Child node's properties patternProperties: '^interconnect-[a-z0-9]+$': @@ -51,29 +41,15 @@ patternProperties: '#interconnect-cells': const: 1 - clock-names: - items: - - const: bus - - const: bus_a - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - required: - compatible - '#interconnect-cells' - - clock-names - - clocks additionalProperties: false required: - compatible - reg - - clock-names - - clocks unevaluatedProperties: false @@ -85,32 +61,20 @@ examples: compatible = "qcom,qcm2290-snoc"; reg = <0x01880000 0x60200>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; qup_virt: interconnect-qup { compatible = "qcom,qcm2290-qup-virt"; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_QUP_CLK>, - <&rpmcc RPM_SMD_QUP_A_CLK>; }; mmnrt_virt: interconnect-mmnrt { compatible = "qcom,qcm2290-mmnrt-virt"; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_MMNRT_CLK>, - <&rpmcc RPM_SMD_MMNRT_A_CLK>; }; mmrt_virt: interconnect-mmrt { compatible = "qcom,qcm2290-mmrt-virt"; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_MMRT_CLK>, - <&rpmcc RPM_SMD_MMRT_A_CLK>; }; }; @@ -118,16 +82,10 @@ examples: compatible = "qcom,qcm2290-cnoc"; reg = <0x01900000 0x8200>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_CNOC_CLK>, - <&rpmcc RPM_SMD_CNOC_A_CLK>; }; bimc: interconnect@4480000 { compatible = "qcom,qcm2290-bimc"; reg = <0x04480000 0x80000>; #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; }; From patchwork Fri Jul 21 13:54:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705357 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 5316FEB64DC for ; Fri, 21 Jul 2023 13:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231602AbjGUNyf (ORCPT ); Fri, 21 Jul 2023 09:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230389AbjGUNy2 (ORCPT ); Fri, 21 Jul 2023 09:54:28 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 662A7273F for ; Fri, 21 Jul 2023 06:54:25 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2b743161832so28685411fa.1 for ; Fri, 21 Jul 2023 06:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947663; x=1690552463; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dmfN4SKKWgK9SW4qxPnUm0MpTFrsYug3xDM0d387yPI=; b=F83EroK6OBml0MUgVeu7s6BDBA2sDqis1LjO3BCG83C1QnRV576crNGuUGN8QEfEFs cA6gmQooMkR/UXjI4RrOksOoqgGlmFtx9+bZuByvnhqQ3Cow86wl3iRV2TYd5sgrsX7h 94zQlXi3ObNnpJ2F/wLn7Z+uiuzJKY8CTS2mKzjSz/WDYxH5SuutdHfMuuCW8D72kqqY iVnMnkxxMGiMFjp4Z8T0brtjFelyTgY9Ic0gzbs88sNHaPkENAoenI02XCztPEr3IoEi YaH1YjRFD9JATxXZ3xjDY4uzSPvYkvAvgTv0tHlcDlyDjPj3BHH7yFsIkrk5rqj3vlzm grNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947663; x=1690552463; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dmfN4SKKWgK9SW4qxPnUm0MpTFrsYug3xDM0d387yPI=; b=BpJ91o8JsEKcLfS9qMgWrHh5K0nQGkna+MTxzbX1l3olEYzV3TUXsSMaV0BHVDCcRF 22LLTqnal5+zxBsXXi4GggOHk+M/fGxyysn3lcufTgyJKpz9tmO7BOvLro4jQDllPA8K ZfAZdiw39LL8nuramiDTqLyFL5hWru4L0XgQox0GNIMVZizLcSxMzShvI+aYf/nyGCcP yxQFq7ZtjJFqLm3o6Z11/pqPybNexCjr8PLQfqikJMTKbVAKLOfql9r20gNSdtDrbiJ4 FGaBkv4WymTgje6i+ARDCNfcjpKHVLgITksXyOH2Xqk1uG36kUI5le9nF+DSn193H9T0 Qj0A== X-Gm-Message-State: ABy/qLZokldLHRHktCAKHYEB2EIW62mjJKm8224gmuGoSNY/Yk+ilHj3 kzWhM2Zyr7ztdOG8llfY6RBvGQ== X-Google-Smtp-Source: APBJJlEeCRdAr8ZuAcMFq9XoN7de/HE4jIYhsQ68vKch3Vx7KOpkJ4MlKcbdHlqCNZaALTvEoVh0YQ== X-Received: by 2002:a2e:968e:0:b0:2b7:b9ca:3eda with SMTP id q14-20020a2e968e000000b002b7b9ca3edamr1808428lji.34.1689947663696; Fri, 21 Jul 2023 06:54:23 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:23 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:13 +0200 Subject: [PATCH 3/7] dt-bindings: interconnect: qcom: Fix and separate out MSM8916 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-3-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=4542; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Rv/Btqa2ja+j05knCsIBBCAEjs5ZCyG116l9ptPC73c=; b=KBUDXhd297a2ySmSIc5WkgT3ReFiitE47DKx9LMZ3QeuCQelgVINMcJtrGsw1Sg7PhEC4BAZR kns54i10YIODIR5OxcZkKammUDkZnCk2ECDGcLLHVUOsULB8kJrAHEh X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Separate out MSM8916 icc bindings and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. Replace the example in qcom,rpm.yaml with MSM8939 to keep it relevant to the file. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8916.yaml | 52 ++++++++++++++++++++++ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 24 +++++----- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml new file mode 100644 index 000000000000..49baf808c087 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8916.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,msm8916.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm MSM8916 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm MSM8916 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +allOf: + - $ref: qcom,rpm-common.yaml# + +properties: + compatible: + enum: + - qcom,msm8916-bimc + - qcom,msm8916-pcnoc + - qcom,msm8916-snoc + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + snoc: interconnect@580000 { + compatible = "qcom,msm8916-snoc"; + reg = <0x00580000 0x14000>; + #interconnect-cells = <1>; + }; + + pcnoc: interconnect@500000 { + compatible = "qcom,msm8916-pcnoc"; + reg = <0x00500000 0x11000>; + #interconnect-cells = <1>; + }; + + bimc: interconnect@400000 { + compatible = "qcom,msm8916-bimc"; + reg = <0x00400000 0x62000>; + #interconnect-cells = <1>; + }; diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 4f95d512012a..788c5e88445a 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -20,9 +20,6 @@ properties: compatible: enum: - - qcom,msm8916-bimc - - qcom,msm8916-pcnoc - - qcom,msm8916-snoc - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc @@ -109,9 +106,6 @@ allOf: compatible: contains: enum: - - qcom,msm8916-bimc - - qcom,msm8916-pcnoc - - qcom,msm8916-snoc - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc @@ -254,7 +248,7 @@ examples: #include bimc: interconnect@400000 { - compatible = "qcom,msm8916-bimc"; + compatible = "qcom,msm8939-bimc"; reg = <0x00400000 0x62000>; #interconnect-cells = <1>; clock-names = "bus", "bus_a"; @@ -263,7 +257,7 @@ examples: }; pcnoc: interconnect@500000 { - compatible = "qcom,msm8916-pcnoc"; + compatible = "qcom,msm8939-pcnoc"; reg = <0x00500000 0x11000>; #interconnect-cells = <1>; clock-names = "bus", "bus_a"; @@ -272,10 +266,18 @@ examples: }; snoc: interconnect@580000 { - compatible = "qcom,msm8916-snoc"; - reg = <0x00580000 0x14000>; - #interconnect-cells = <1>; + compatible = "qcom,msm8939-snoc"; + reg = <0x00580000 0x14080>; clock-names = "bus", "bus_a"; clocks = <&rpmcc RPM_SMD_SNOC_CLK>, <&rpmcc RPM_SMD_SNOC_A_CLK>; + #interconnect-cells = <1>; + + snoc_mm: interconnect-snoc { + compatible = "qcom,msm8939-snoc-mm"; + clock-names = "bus", "bus_a"; + clocks = <&rpmcc RPM_SMD_SYSMMNOC_CLK>, + <&rpmcc RPM_SMD_SYSMMNOC_A_CLK>; + #interconnect-cells = <1>; + }; }; From patchwork Fri Jul 21 13:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705025 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 06754C001E0 for ; Fri, 21 Jul 2023 13:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231625AbjGUNyh (ORCPT ); Fri, 21 Jul 2023 09:54:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbjGUNyc (ORCPT ); Fri, 21 Jul 2023 09:54:32 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 510F32D4A for ; Fri, 21 Jul 2023 06:54:27 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2b6f97c7115so28774451fa.2 for ; Fri, 21 Jul 2023 06:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947665; x=1690552465; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=COTS/QAzo5ItroUDDp1ljiZnm31YXIXNnO3NqsFfRYw=; b=y+8NMTdSEjosl0+VrEL2m6ZeT7xTsyDFr4cnLNNPVQTStO8jTr5rveshY4sV9P+frU CGt+3fWtG07MLhTsppsLp0wRDDQqLdOprHAgh1ObslLOSMeEjOP5DkX31/n+s0XkIE5v 0P4Gde8n0aluwjlXivw2tckcWg/Sr+/U+0j2q3wW+y1TkdD4jnk4F1/aaPVxdx1ndq23 raRIOjPsBGFw2JEzSH9FgL6i8PQSPzEdvnL9Vl4kOP0prIBoiMW5ZIX4tiu16VL0W3Jc xLQY8XAT8AiPF1kUso5hFR+aHXROKQo1bIaypG2iVZw49DgUI/QoAiJ0XvuKo0PB6Uns LNZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947665; x=1690552465; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=COTS/QAzo5ItroUDDp1ljiZnm31YXIXNnO3NqsFfRYw=; b=P1IA9EaAtT/OyuQzX8D7FynX1pbcQE/M8aZzmcTN7UEFNm3aVlvN8rA1DLGlhPDWAN QEJ5bZ/cZY/P3Xw9n3zg0Bo3mExTyXHVId62eFvY/500tnRS2nOYyrtw+4Udor4TeIrN cpYJ8VlAR81vjY92v15C1nPVMPMYv7xoOvOF9YmBOjM6Btfeql8xS0rtruHgNeDPQMbt psDSOBmSUtjS4dtH2DRQnYg8kcaVe6rJ9xm4Ra1tXwLS3QFbV69QdTVVXTG7hD2Pk3d1 d4PDGCYCxgR4FTTTRA3l0mvbJCjw+xOA1uuMb9vN1mbW0vurKqVEsyWrqWOPaaBlBLW3 xcHQ== X-Gm-Message-State: ABy/qLa3BwJrlv75FJqmjpr1dE1/ygkg7YH7S3lmw7MMfrXxvVWd//OQ wW8r9rqtCbDebMNqVapF/7SQ9Q== X-Google-Smtp-Source: APBJJlE85ryxNMlu107A42OO0UvtGFEp8nSS1azwcvqukkajt3C6uFUSXFUlgEyB4/Mbv4Uv9itnnA== X-Received: by 2002:a2e:6e07:0:b0:2b6:eefc:3e4f with SMTP id j7-20020a2e6e07000000b002b6eefc3e4fmr1625173ljc.21.1689947665464; Fri, 21 Jul 2023 06:54:25 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:25 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:14 +0200 Subject: [PATCH 4/7] dt-bindings: interconnect: qcom: Fix and separate out QCS404 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-4-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=2986; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=yLJmYoQCZT249tBOoFu+9SOOzsVr7Zl0XM5AXz8MbsI=; b=le/7VScrw3t1YzGj0I8yE/857CPeEuZL18cQbdq51fPW5X5Obfb6+o2cnDr1kLn7bHyNuNfbK XQoOwyt50QsBbXbtwm8D4mUEio+W2fT4ZpGaVm7ymCNgMXdGo8GWUtL X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Separate out QCS404 icc bindings from the common file and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,qcs404.yaml | 52 ++++++++++++++++++++++ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 6 --- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml b/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml new file mode 100644 index 000000000000..aff2daa55802 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,qcs404.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,qcs404.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm QCS404 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm QCS404 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +allOf: + - $ref: qcom,rpm-common.yaml# + +properties: + compatible: + enum: + - qcom,qcs404-bimc + - qcom,qcs404-pcnoc + - qcom,qcs404-snoc + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + snoc: interconnect@580000 { + compatible = "qcom,qcs404-snoc"; + reg = <0x00580000 0x23080>; + #interconnect-cells = <1>; + }; + + pcnoc: interconnect@500000 { + compatible = "qcom,qcs404-pcnoc"; + reg = <0x00500000 0x15080>; + #interconnect-cells = <1>; + }; + + bimc: interconnect@400000 { + compatible = "qcom,qcs404-bimc"; + reg = <0x00400000 0x80000>; + #interconnect-cells = <1>; + }; diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 788c5e88445a..58075c23f9f9 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -31,9 +31,6 @@ properties: - qcom,msm8996-mnoc - qcom,msm8996-pnoc - qcom,msm8996-snoc - - qcom,qcs404-bimc - - qcom,qcs404-pcnoc - - qcom,qcs404-snoc - qcom,sdm660-a2noc - qcom,sdm660-bimc - qcom,sdm660-cnoc @@ -114,9 +111,6 @@ allOf: - qcom,msm8996-cnoc - qcom,msm8996-pnoc - qcom,msm8996-snoc - - qcom,qcs404-bimc - - qcom,qcs404-pcnoc - - qcom,qcs404-snoc - qcom,sdm660-bimc - qcom,sdm660-cnoc - qcom,sdm660-gnoc From patchwork Fri Jul 21 13:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705356 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 2C678EB64DD for ; Fri, 21 Jul 2023 13:54:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231667AbjGUNys (ORCPT ); Fri, 21 Jul 2023 09:54:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231611AbjGUNyg (ORCPT ); Fri, 21 Jul 2023 09:54:36 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6840F30D2 for ; Fri, 21 Jul 2023 06:54:29 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b6f97c7115so28775031fa.2 for ; Fri, 21 Jul 2023 06:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947667; x=1690552467; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OBUsteqLu7y8+xgr1TJou03mZFL/AZVahDAq950kxKE=; b=rjF47Th3/hRTDtMyoiSfusLRy39bct+VeR7dGUzA8U3wzLvbdq6BggiappuVyRStkQ woRrFxR5ng+TiR5PxGZ8+ulUBEEiwIcFp/XotNZuWe7NvFNZwoR6EZ7HArcQLF4ywx0h wX1zlFmH+KC/dSDrc8HRXnvh8SQV0/5sD6sMOHSu7ucRonVMEDk5rHf2SjTEOOcAaxf8 JfWKSoM6anJ+LSxu0L9+Hj7UzCYWLaMmH4up69p5vZGnqguKOFAx23PjlT3VHtIzIDil DGB0awSXhBTb/dZSaKppt1r+FWXpVtC9k/dnSCqDKmXRKYayG3/cfX/YlPDWzotNDTG0 a8CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947667; x=1690552467; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OBUsteqLu7y8+xgr1TJou03mZFL/AZVahDAq950kxKE=; b=VCrL+D7+cjQPEDt2nWZ53J+BwY2SzCZOJAw9NTSoDIxbOF9FSk4tQWOnUkjd+OXYv+ WWjqpEMVeeE/hch7ftWcDuML7Vyu8lUNwrGUPePv7enIx+j73san4tA+aaXglP71mHoL 6CrZz0VBPzBbHUAuaiu+8/wWeRocncyXD38a7F2ZFlSHCPlavRVSVFez9PIJ9vSTNyPA z1DvvmeA3OHG8mZZB+PTilbBsOP31GWM+4t8R5TyAl2kseBwCFOy/Leq0oyI31mGLdEr tQSPnyCqcgPtQzwhtyPoV2PmXuQRjjdxzRSzpBknBU9lde9Gi+4B6XSEtMPVaWB41bl6 EvaQ== X-Gm-Message-State: ABy/qLZz+53NtyCxk2tVLEMn7Zt66owc5B8UxcYLEIzM+fGgNsZtR8ip skEzCwzF9DWCiIBmiP0TC+FvfMw4SxKBOH1CS4xeag== X-Google-Smtp-Source: APBJJlHXXgj3BLIgzyOPCmokvIYAs7FTHU9urEnquOD67fGEIlob8jhC5MCYE8UzWCpkRT9zQKdQ7A== X-Received: by 2002:a2e:918f:0:b0:2b9:4811:2b6 with SMTP id f15-20020a2e918f000000b002b9481102b6mr1644947ljg.48.1689947667418; Fri, 21 Jul 2023 06:54:27 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:27 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:15 +0200 Subject: [PATCH 5/7] dt-bindings: interconnect: qcom: Fix and separate out SDM660 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-5-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=6388; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=aIph4bDHvXEr+JTA974zl/DL90W6BaBG3UKW2IdvHQI=; b=H+lDdtOm5Q9CBZU5K7TQHbP+0H8cCp3axubc3Nsz0PSofl6P3mZR68vYjR9EaZ+L4EQhjowjs FbaZBLP9Xi5C5b/513gHtDWV4sQm+lVbJyCS/bNsFSPGBmZJnsTNowr X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Separate out SDM660 icc bindings from the common file and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/interconnect/qcom,rpm.yaml | 40 ------- .../bindings/interconnect/qcom,sdm660.yaml | 131 +++++++++++++++++++++ 2 files changed, 131 insertions(+), 40 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 58075c23f9f9..00fe355f26de 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -31,12 +31,6 @@ properties: - qcom,msm8996-mnoc - qcom,msm8996-pnoc - qcom,msm8996-snoc - - qcom,sdm660-a2noc - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-mnoc - - qcom,sdm660-snoc '#interconnect-cells': description: | @@ -111,10 +105,6 @@ allOf: - qcom,msm8996-cnoc - qcom,msm8996-pnoc - qcom,msm8996-snoc - - qcom,sdm660-bimc - - qcom,sdm660-cnoc - - qcom,sdm660-gnoc - - qcom,sdm660-snoc then: properties: @@ -134,7 +124,6 @@ allOf: contains: enum: - qcom,msm8996-mnoc - - qcom,sdm660-mnoc then: properties: @@ -197,35 +186,6 @@ allOf: - description: Aggregate2 NoC UFS AXI Clock - description: UFS AXI Clock - - if: - properties: - compatible: - contains: - enum: - - qcom,sdm660-a2noc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: ipa - - const: ufs_axi - - const: aggre2_ufs_axi - - const: aggre2_usb3_axi - - const: cfg_noc_usb2_axi - - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - - description: IPA Clock. - - description: UFS AXI Clock. - - description: Aggregate2 UFS AXI Clock. - - description: Aggregate2 USB3 AXI Clock. - - description: Config NoC USB2 AXI Clock. - - if: not: properties: diff --git a/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml b/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml new file mode 100644 index 000000000000..29b1a1987642 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml @@ -0,0 +1,131 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,sdm660.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SDM660 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm SDM660 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +properties: + compatible: + enum: + - qcom,sdm660-a2noc + - qcom,sdm660-bimc + - qcom,sdm660-cnoc + - qcom,sdm660-gnoc + - qcom,sdm660-mnoc + - qcom,sdm660-snoc + + clock-names: + minItems: 1 + maxItems: 5 + + clocks: + minItems: 1 + maxItems: 5 + +required: + - compatible + - reg + +unevaluatedProperties: false + +allOf: + - $ref: qcom,rpm-common.yaml# + - if: + properties: + compatible: + const: qcom,sdm660-mnoc + + then: + properties: + clocks: + items: + - description: CPU-NoC High-performance Bus Clock. + + clock-names: + const: iface + + - if: + properties: + compatible: + const: qcom,sdm660-a2noc + + then: + properties: + clocks: + items: + - description: IPA Clock. + - description: UFS AXI Clock. + - description: Aggregate2 UFS AXI Clock. + - description: Aggregate2 USB3 AXI Clock. + - description: Config NoC USB2 AXI Clock. + + clock-names: + items: + - const: ipa + - const: ufs_axi + - const: aggre2_ufs_axi + - const: aggre2_usb3_axi + - const: cfg_noc_usb2_axi + +examples: + - | + #include + #include + #include + + bimc: interconnect@1008000 { + compatible = "qcom,sdm660-bimc"; + reg = <0x01008000 0x78000>; + #interconnect-cells = <1>; + }; + + cnoc: interconnect@1500000 { + compatible = "qcom,sdm660-cnoc"; + reg = <0x01500000 0x10000>; + #interconnect-cells = <1>; + }; + + snoc: interconnect@1626000 { + compatible = "qcom,sdm660-snoc"; + reg = <0x01626000 0x7090>; + #interconnect-cells = <1>; + }; + + a2noc: interconnect@1704000 { + compatible = "qcom,sdm660-a2noc"; + reg = <0x01704000 0xc100>; + #interconnect-cells = <1>; + clocks = <&rpmcc RPM_SMD_IPA_CLK>, + <&gcc GCC_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_UFS_AXI_CLK>, + <&gcc GCC_AGGRE2_USB3_AXI_CLK>, + <&gcc GCC_CFG_NOC_USB2_AXI_CLK>; + clock-names = "ipa", + "ufs_axi", + "aggre2_ufs_axi", + "aggre2_usb3_axi", + "cfg_noc_usb2_axi"; + }; + + mnoc: interconnect@1745000 { + compatible = "qcom,sdm660-mnoc"; + reg = <0x01745000 0xa010>; + #interconnect-cells = <1>; + clocks = <&mmcc AHB_CLK_SRC>; + clock-names = "iface"; + }; + + gnoc: interconnect@17900000 { + compatible = "qcom,sdm660-gnoc"; + reg = <0x17900000 0xe000>; + #interconnect-cells = <1>; + }; From patchwork Fri Jul 21 13:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705024 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 C7250EB64DD for ; Fri, 21 Jul 2023 13:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231708AbjGUNyx (ORCPT ); Fri, 21 Jul 2023 09:54:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231637AbjGUNyq (ORCPT ); Fri, 21 Jul 2023 09:54:46 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA58930F3 for ; Fri, 21 Jul 2023 06:54:31 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2b95d5ee18dso29694521fa.1 for ; Fri, 21 Jul 2023 06:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947669; x=1690552469; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mWkRcpOedeArCEscq2yxcc47EYJ2ymI/mFGN4ymylxQ=; b=yjqB2ejH0JTFcLFtXnkUneZGRe6r+jQjd/jBbk1oTsEKfwGSaoaMg1W6hsAWIpUOWx Xaknm8WI3qAQO/zLEnJJ7C3F50qc4ixmaRvoydocqkX9BUXmCWJUbvmKHkD2GGW5m4z1 c5ISVev+1IzSvD8mlAOUkDpcAECT0K7MbACsc1lyX7KLHrifNm4Zf4TLDdtOWCLwKjzj 4RN/VWCfv5T3LYtIUL5dAb+T8UqmcQnOYuiIjFPoaIW5995rBq5RHjP13YB/wGE4Mhid KlbQgUFm9De1lBTpmcim+BE7u4YZVP1KZXqdUrLruVONGMOxbDpHP6upMI4ln33FSe2b kVPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947669; x=1690552469; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mWkRcpOedeArCEscq2yxcc47EYJ2ymI/mFGN4ymylxQ=; b=ePPSuhiAdtgQ6PxDqxxEnrN9A+XtXxD/MRDqVCbG3CL+fi2eBDNCrF0XYAQzLEKWyq qvd45cCO50z+qzGWhc3yoNImGyHukvkUOIk5MTEVfjQwOjuuypwbqTuhVV8VsatM9fG3 /J/cHunh3RWQo37Aoj/GemTtdjLWpK2WgSXOuJqEcX2tBOb2NSVevGxazRfsRMpmOR67 C6QO4Zq8uJh4dt7blHOwI0PRc5+nEjHcfGuIV4vu/xGmHw5tXO9xDMQJzD/E5hgeGNis L1a/ozPPz3T8bpo7UXOgiTuP/u9LRt6gtmNXHx7YcPgLfLLMN4nnyocKu5Up9TnpD/Pt b94w== X-Gm-Message-State: ABy/qLaig95E5vc8662C2Xdkh2+cmVAtf4qSZ3cXBR05ks/gj9l6nNwh e8/z1q2s0d08MBBANlfx5Gwo1A== X-Google-Smtp-Source: APBJJlFzX8NvFeCGnp5Z6uexkXvl+ajqV5Bpc3yzOia4g9Dwpc4znJkXphgSPRXe7TSN2qOcH9JDwg== X-Received: by 2002:a2e:86da:0:b0:2b6:efd0:5dd8 with SMTP id n26-20020a2e86da000000b002b6efd05dd8mr1634608ljj.46.1689947669377; Fri, 21 Jul 2023 06:54:29 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:29 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:16 +0200 Subject: [PATCH 6/7] dt-bindings: interconnect: qcom: Fix and separate out MSM8996 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-6-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=7945; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=PWu3a5dolgeEy3btNnyCZeLaOBqvgejanYJrTAWDhz4=; b=Nx+O8TB9iqeNL6qPuRipXL3ucY+bObWvrXPCWIhTMq9GING8aOc5bd+RHeA834Z7DCo9W/9rQ 36ySWj50FqFB/9VltFGM5agtvQXe057i897XV6HDMdJMlQTXf+lJRdT X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Separate out MSM8996 icc bindings from the common file and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8996.yaml | 165 +++++++++++++++++++++ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 81 ---------- 2 files changed, 165 insertions(+), 81 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml new file mode 100644 index 000000000000..c003ca5ee746 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml @@ -0,0 +1,165 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,msm8996.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm MSM8996 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm MSM8996 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +properties: + compatible: + enum: + - qcom,msm8996-a0noc + - qcom,msm8996-a1noc + - qcom,msm8996-a2noc + - qcom,msm8996-bimc + - qcom,msm8996-cnoc + - qcom,msm8996-mnoc + - qcom,msm8996-pnoc + - qcom,msm8996-snoc + + clock-names: + minItems: 1 + maxItems: 3 + + clocks: + minItems: 1 + maxItems: 3 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +allOf: + - $ref: qcom,rpm-common.yaml# + - if: + properties: + compatible: + const: qcom,msm8996-a0noc + + then: + properties: + clocks: + items: + - description: Aggregate0 System NoC AXI Clock. + - description: Aggregate0 Config NoC AHB Clock. + - description: Aggregate0 NoC MPU Clock. + + clock-names: + items: + - const: aggre0_snoc_axi + - const: aggre0_cnoc_ahb + - const: aggre0_noc_mpu_cfg + + required: + - power-domains + + - if: + properties: + compatible: + const: qcom,msm8996-mnoc + + then: + properties: + clocks: + items: + - description: CPU-NoC High-performance Bus Clock. + + clock-names: + const: iface + + - if: + properties: + compatible: + const: qcom,msm8996-a2noc + + then: + properties: + clocks: + items: + - description: Aggregate2 NoC UFS AXI Clock + - description: UFS AXI Clock + + clock-names: + items: + - const: aggre2_ufs_axi + - const: ufs_axi + +examples: + - | + #include + #include + #include + + bimc: interconnect@408000 { + compatible = "qcom,msm8996-bimc"; + reg = <0x00408000 0x5a000>; + #interconnect-cells = <1>; + }; + + cnoc: interconnect@500000 { + compatible = "qcom,msm8996-cnoc"; + reg = <0x00500000 0x1000>; + #interconnect-cells = <1>; + }; + + snoc: interconnect@524000 { + compatible = "qcom,msm8996-snoc"; + reg = <0x00524000 0x1c000>; + #interconnect-cells = <1>; + }; + + a0noc: interconnect@543000 { + compatible = "qcom,msm8996-a0noc"; + reg = <0x00543000 0x6000>; + #interconnect-cells = <1>; + clocks = <&gcc GCC_AGGRE0_SNOC_AXI_CLK>, + <&gcc GCC_AGGRE0_CNOC_AHB_CLK>, + <&gcc GCC_AGGRE0_NOC_MPU_CFG_AHB_CLK>; + clock-names = "aggre0_snoc_axi", + "aggre0_cnoc_ahb", + "aggre0_noc_mpu_cfg"; + power-domains = <&gcc AGGRE0_NOC_GDSC>; + }; + + a1noc: interconnect@562000 { + compatible = "qcom,msm8996-a1noc"; + reg = <0x00562000 0x5000>; + #interconnect-cells = <1>; + }; + + a2noc: interconnect@583000 { + compatible = "qcom,msm8996-a2noc"; + reg = <0x00583000 0x7000>; + clocks = <&gcc GCC_AGGRE2_UFS_AXI_CLK>, + <&gcc GCC_UFS_AXI_CLK>; + clock-names = "aggre2_ufs_axi", + "ufs_axi"; + #interconnect-cells = <1>; + }; + + mnoc: interconnect@5a4000 { + compatible = "qcom,msm8996-mnoc"; + reg = <0x005a4000 0x1c000>; + clocks = <&mmcc AHB_CLK_SRC>; + clock-names = "iface"; + #interconnect-cells = <1>; + }; + + pnoc: interconnect@5c0000 { + compatible = "qcom,msm8996-pnoc"; + reg = <0x005c0000 0x3000>; + #interconnect-cells = <1>; + }; diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 00fe355f26de..6f8836312496 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -23,14 +23,6 @@ properties: - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc - - qcom,msm8996-a0noc - - qcom,msm8996-a1noc - - qcom,msm8996-a2noc - - qcom,msm8996-bimc - - qcom,msm8996-cnoc - - qcom,msm8996-mnoc - - qcom,msm8996-pnoc - - qcom,msm8996-snoc '#interconnect-cells': description: | @@ -100,11 +92,6 @@ allOf: - qcom,msm8939-bimc - qcom,msm8939-pcnoc - qcom,msm8939-snoc - - qcom,msm8996-a1noc - - qcom,msm8996-bimc - - qcom,msm8996-cnoc - - qcom,msm8996-pnoc - - qcom,msm8996-snoc then: properties: @@ -118,74 +105,6 @@ allOf: - description: Bus Clock - description: Bus A Clock - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-mnoc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: iface - - clocks: - items: - - description: Bus Clock. - - description: Bus A Clock. - - description: CPU-NoC High-performance Bus Clock. - - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-a0noc - - then: - properties: - clock-names: - items: - - const: aggre0_snoc_axi - - const: aggre0_cnoc_ahb - - const: aggre0_noc_mpu_cfg - - clocks: - items: - - description: Aggregate0 System NoC AXI Clock. - - description: Aggregate0 Config NoC AHB Clock. - - description: Aggregate0 NoC MPU Clock. - - required: - - power-domains - - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8996-a2noc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - const: aggre2_ufs_axi - - const: ufs_axi - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - - description: Aggregate2 NoC UFS AXI Clock - - description: UFS AXI Clock - - if: not: properties: From patchwork Fri Jul 21 13:54:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 705355 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 6BEFDEB64DD for ; Fri, 21 Jul 2023 13:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231738AbjGUNy5 (ORCPT ); Fri, 21 Jul 2023 09:54:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231654AbjGUNyr (ORCPT ); Fri, 21 Jul 2023 09:54:47 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 442773599 for ; Fri, 21 Jul 2023 06:54:33 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b701e41cd3so28318571fa.3 for ; Fri, 21 Jul 2023 06:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689947671; x=1690552471; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BpX4cT8wPV+NQfH+IImmqD1hdn6km50iOH+4WrfJWg8=; b=yCjR6tdX/gl2oyIl+4eD24upwiujU/zwrEtEmDq9IctO0lYxoDiJ62S44TfIy3rcs/ 25WPeU5SQ4B5S+pT8cm/FnEA7lT3x6o55b13OdnkdyV0fSVMHULXeNb6Fw088OVHatqI vYJ36nZ0toihwf+93ttE8dB/uJDGTL4dxXo8ts8jJcS3CSKl5Jdmb3JIWKVW/DVsYLCA DxwjPGKbseCBqnLQG9xeVgDlCOz9lR3JTq9v4GGXUns6dmqGQdZQ1zcMGn941OQ7VobX GrZrHtsazHLRy4ilVc34BR2ML2iPOt+tvIcYBzK5nDfmnja1deulnuSrEddk+KFZ5WCR WVOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689947671; x=1690552471; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BpX4cT8wPV+NQfH+IImmqD1hdn6km50iOH+4WrfJWg8=; b=iG0tpR54l1Y9tX560Jnmd6hekNaU4K88JNZw/f+IlzYeIdBOKgcxis8kwEeM/eedWL xA0PlDMpWf2mCZfHDHjzncK2Q5N2pke6Wuyz7LlaJMq3FymI1Lc4XrJdXhlBLr47ErPk ersigbWKRDV8T4Rk2j8B/d1BDYOlQSvDu8eyfyGAwdoOtto+FDacqc3+123kAKjNJ3HB 3GG9FTD9a9s4XMAudlhz3dXmz+tunKEJzekwqJ2fOtsi2p9kocPXheiApqgZKSnxpJkS hUAFacIr/TfD8Azy6WB9xOm4wD28m3+GAsAhkx7wzqOBtLDffZUHD7E0i2jR0TJ6rCNE VNnQ== X-Gm-Message-State: ABy/qLallCOOdax+X9WkMzhUlxsxFhIZlchIOrMDKGRCcaGxJTh+hZJp tPpfFwIy0LG+CmhfALNMBI1iWw== X-Google-Smtp-Source: APBJJlHgIaRtr1McXoxhDuFZTQC/N+rwooAH0qB8pe7oyGzpGS4Qm+x0cQqulgqiXKZjxneBZ96Crw== X-Received: by 2002:a2e:3806:0:b0:2b6:d326:156d with SMTP id f6-20020a2e3806000000b002b6d326156dmr1489191lja.19.1689947671167; Fri, 21 Jul 2023 06:54:31 -0700 (PDT) Received: from [192.168.1.101] (abyj181.neoplus.adsl.tpnet.pl. [83.9.29.181]) by smtp.gmail.com with ESMTPSA id k21-20020a2e92d5000000b002b6ad323248sm953838ljh.10.2023.07.21.06.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 06:54:30 -0700 (PDT) From: Konrad Dybcio Date: Fri, 21 Jul 2023 15:54:17 +0200 Subject: [PATCH 7/7] dt-bindings: interconnect: qcom: Fix and separate out MSM8939 MIME-Version: 1.0 Message-Id: <20230721-topic-icc_bindings-v1-7-93e2bc728fb7@linaro.org> References: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> In-Reply-To: <20230721-topic-icc_bindings-v1-0-93e2bc728fb7@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo Cc: Marijn Suijten , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1689947656; l=7038; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=IQUTBiDEvFP7VrKldMNLzy8w9qoar1n9X231aFtNUqQ=; b=wcAd3kkT91A4SpXAWDtGg37iM1f2Q2aFmD3WGys3R5+JHy+QiOY1VuRjx5V2J/qelS/7W7ZDN c1TYhlR6H2YA+UgNPNS6VGjuEU3fP6kbY8zEgmRCsvxnwpnu75XD1lJ X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Separate out MSM8939 icc bindings from the common file and fix the clocks description by removing the wrong internal RPM bus clock representation that we've been carrying for years. This was the final one, so also retire the shared file. Signed-off-by: Konrad Dybcio --- .../bindings/interconnect/qcom,msm8939.yaml | 74 ++++++++++ .../devicetree/bindings/interconnect/qcom,rpm.yaml | 156 --------------------- 2 files changed, 74 insertions(+), 156 deletions(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml new file mode 100644 index 000000000000..00378c1ef9d6 --- /dev/null +++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interconnect/qcom,msm8939.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm MSM8939 Network-On-Chip interconnect + +maintainers: + - Konrad Dybcio + +description: | + The Qualcomm MSM8939 interconnect providers support adjusting the + bandwidth requirements between the various NoC fabrics. + +allOf: + - $ref: qcom,rpm-common.yaml# + +properties: + compatible: + enum: + - qcom,msm8939-bimc + - qcom,msm8939-pcnoc + - qcom,msm8939-snoc + +patternProperties: + '^interconnect-[a-z0-9\-]+$': + type: object + $ref: qcom,rpm-common.yaml# + description: + The interconnect providers do not have a separate QoS register space, + but share parent's space. + + properties: + compatible: + const: qcom,msm8939-snoc-mm + + required: + - compatible + + unevaluatedProperties: false + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include + + snoc: interconnect@580000 { + compatible = "qcom,msm8939-snoc"; + reg = <0x00580000 0x14000>; + #interconnect-cells = <1>; + }; + + pcnoc: interconnect@500000 { + compatible = "qcom,msm8939-pcnoc"; + reg = <0x00500000 0x11000>; + #interconnect-cells = <1>; + }; + + bimc: interconnect@400000 { + compatible = "qcom,msm8939-bimc"; + reg = <0x00400000 0x62000>; + #interconnect-cells = <1>; + + snoc_mm: interconnect-snoc { + compatible = "qcom,msm8939-snoc-mm"; + #interconnect-cells = <1>; + }; + }; diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml deleted file mode 100644 index 6f8836312496..000000000000 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ /dev/null @@ -1,156 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/interconnect/qcom,rpm.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Qualcomm RPM Network-On-Chip Interconnect - -maintainers: - - Georgi Djakov - -description: | - RPM interconnect providers support system bandwidth requirements through - RPM processor. The provider is able to communicate with the RPM through - the RPM shared memory device. - -properties: - reg: - maxItems: 1 - - compatible: - enum: - - qcom,msm8939-bimc - - qcom,msm8939-pcnoc - - qcom,msm8939-snoc - - '#interconnect-cells': - description: | - Value: <1> is one cell in an interconnect specifier for the - interconnect node id, <2> requires the interconnect node id and an - extra path tag. - enum: [ 1, 2 ] - - clocks: - minItems: 2 - maxItems: 7 - - clock-names: - minItems: 2 - maxItems: 7 - - power-domains: - maxItems: 1 - -# Child node's properties -patternProperties: - '^interconnect-[a-z0-9]+$': - type: object - additionalProperties: false - description: - snoc-mm is a child of snoc, sharing snoc's register address space. - - properties: - compatible: - enum: - - qcom,msm8939-snoc-mm - - '#interconnect-cells': - const: 1 - - clock-names: - items: - - const: bus - - const: bus_a - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - - required: - - compatible - - '#interconnect-cells' - - clock-names - - clocks - -required: - - compatible - - reg - - '#interconnect-cells' - - clock-names - - clocks - -additionalProperties: false - -allOf: - - if: - properties: - compatible: - contains: - enum: - - qcom,msm8939-bimc - - qcom,msm8939-pcnoc - - qcom,msm8939-snoc - - then: - properties: - clock-names: - items: - - const: bus - - const: bus_a - - clocks: - items: - - description: Bus Clock - - description: Bus A Clock - - - if: - not: - properties: - compatible: - contains: - enum: - - qcom,msm8939-snoc - then: - patternProperties: - '^interconnect-[a-z0-9]+$': false - -examples: - - | - #include - - bimc: interconnect@400000 { - compatible = "qcom,msm8939-bimc"; - reg = <0x00400000 0x62000>; - #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_BIMC_CLK>, - <&rpmcc RPM_SMD_BIMC_A_CLK>; - }; - - pcnoc: interconnect@500000 { - compatible = "qcom,msm8939-pcnoc"; - reg = <0x00500000 0x11000>; - #interconnect-cells = <1>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_PCNOC_CLK>, - <&rpmcc RPM_SMD_PCNOC_A_CLK>; - }; - - snoc: interconnect@580000 { - compatible = "qcom,msm8939-snoc"; - reg = <0x00580000 0x14080>; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_SNOC_CLK>, - <&rpmcc RPM_SMD_SNOC_A_CLK>; - #interconnect-cells = <1>; - - snoc_mm: interconnect-snoc { - compatible = "qcom,msm8939-snoc-mm"; - clock-names = "bus", "bus_a"; - clocks = <&rpmcc RPM_SMD_SYSMMNOC_CLK>, - <&rpmcc RPM_SMD_SYSMMNOC_A_CLK>; - #interconnect-cells = <1>; - }; - };