From mboxrd@z Thu Jan 1 00:00:00 1970 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 33AEDCCA486 for ; Sun, 10 Jul 2022 09:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbiGJJAx (ORCPT ); Sun, 10 Jul 2022 05:00:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbiGJJAs (ORCPT ); Sun, 10 Jul 2022 05:00:48 -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 70A4A11A3F for ; Sun, 10 Jul 2022 02:00:47 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id bx13so3063164ljb.1 for ; Sun, 10 Jul 2022 02:00:47 -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=gEMMqx0XbkclJMa1x7CL7VRmLmoJRkTMt6HpqiUHQfQ=; b=HBoXaaFa9rDG4G+nf7K4XUnOSX7mbz3qdBOj67DchbRDTj8ZMEa8Jm4zMXvfXdztp1 d/3WkQ2Y7wLlwyEuhtqFYmj6oaLqg4x9FiPysDZM4SUxeFRPzjJuZwvdr60hhMruCBe8 IwDasbvgt4MqQ++QYW0Sopd8OYMVkmFMoaZN0CruDqV9WbJKG3xDYO0EiD1BUSL6odOZ 5p9lCGVowQASsT+C2dqIFTSf2DINNqxJv+wL8V9hhKQR0XYSf1a+IP84ZrFhgku1R/1U uLht6RZkKq+K6tlJnWlv1otUUsRqPMO2rNU48TmzDvX8tuzWey+vzMKXkwkGGUoD+qdK GtXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gEMMqx0XbkclJMa1x7CL7VRmLmoJRkTMt6HpqiUHQfQ=; b=McrFKIrN4p1fZKdWRdCfsOPNm2H0kHSIO5YuS7VwFPEuNdZ/bXaZFGnynXD7KDb62n MpCrhfdFa4tv4PQEC2GlMnshQhOccrjUs3uACYQpS+pRU8gt0XjB6UcpBACzPnb9tZMZ vYO4Afw9CoA9W0nyXwVKeG77nGVAxi0ZcNH48S2gy9H/+MSm6MI8ULkTuqEenvEV9f6Q qBD7YhUJfoqsFmSV/ylaPltku+Pi8YTlmm7NiWZ6LQSsJI80UTBELRzjL0xkiu6cOQee s6HaxWzOVP8EWK+3cNLoYEBqgP5Z1WHmUBx9sGv0GYWFMSbWtCN92HymYFJ+v7yoUqkj DyOQ== X-Gm-Message-State: AJIora/TEfVEPNmMowCfSNze7cASPkoeIiqtwgThi5v/GBQO845MGx81 ol8aEDrBr+rr9YPdRcQMhnjygQ== X-Google-Smtp-Source: AGRyM1vVkIO5gPaIqWKylhRxsvc75vQkC1Wgz7syaWB2rBv3bGc0tT9Y+rgQ3bts9DuLTKnl4IqXPw== X-Received: by 2002:a05:651c:211f:b0:25a:86c4:bfe4 with SMTP id a31-20020a05651c211f00b0025a86c4bfe4mr7046997ljq.531.1657443646884; Sun, 10 Jul 2022 02:00:46 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u16-20020a056512095000b004896b58f2fasm822881lft.270.2022.07.10.02.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jul 2022 02:00:46 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Clark , Sean Paul , Abhinav Kumar , Rob Herring , Krzysztof Kozlowski Cc: Stephen Boyd , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH v2 07/11] dt-bindings: display/msm: move qcom,sc7280-mdss schema to mdss.yaml Date: Sun, 10 Jul 2022 12:00:36 +0300 Message-Id: <20220710090040.35193-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220710090040.35193-1-dmitry.baryshkov@linaro.org> References: <20220710090040.35193-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move schema for qcom,sc7280-mdss from dpu-sc7280.yaml to mdss.yaml so that the dpu file describes only the DPU schema. Signed-off-by: Dmitry Baryshkov --- .../bindings/display/msm/dpu-sc7280.yaml | 148 +++++------------- .../devicetree/bindings/display/msm/mdss.yaml | 19 +++ 2 files changed, 57 insertions(+), 110 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml index f427eec3d3a4..349a454099ad 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml @@ -10,149 +10,77 @@ maintainers: - Krishna Manikandan description: | - Device tree bindings for MSM Mobile Display Subsystem (MDSS) that encapsulates - sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree - bindings of MDSS and DPU are mentioned for SC7280. + Device tree bindings for the DPU display controller for SC7280 target. properties: compatible: - const: qcom,sc7280-mdss + const: qcom,sc7280-dpu reg: - maxItems: 1 + items: + - description: Address offset and size for mdp register set + - description: Address offset and size for vbif register set reg-names: - const: mdss - - power-domains: - maxItems: 1 + items: + - const: mdp + - const: vbif clocks: items: - - description: Display AHB clock from gcc - - description: Display AHB clock from dispcc + - description: Display hf axi clock + - description: Display sf axi clock + - description: Display ahb clock + - description: Display lut clock - description: Display core clock + - description: Display vsync clock clock-names: items: + - const: bus + - const: nrt_bus - const: iface - - const: ahb + - const: lut - const: core + - const: vsync interrupts: maxItems: 1 - interrupt-controller: true - - "#address-cells": true - - "#size-cells": true - - "#interrupt-cells": - const: 1 - - iommus: - items: - - description: Phandle to apps_smmu node with SID mask for Hard-Fail port0 - - ranges: true - - interconnects: - items: - - description: Interconnect path specifying the port ids for data bus - - interconnect-names: - const: mdp0-mem + power-domains: + maxItems: 1 - resets: - items: - - description: MDSS_CORE reset + operating-points-v2: true -patternProperties: - "^display-controller@[0-9a-f]+$": - type: object - description: Node containing the properties of DPU. + ports: + $ref: /schemas/graph.yaml#/properties/ports + description: | + Contains the list of output ports from DPU device. These ports + connect to interfaces that are external to the DPU hardware, + such as DSI, DP etc. Each output port contains an endpoint that + describes how it is connected to an external interface. properties: - compatible: - const: qcom,sc7280-dpu - - reg: - items: - - description: Address offset and size for mdp register set - - description: Address offset and size for vbif register set - - reg-names: - items: - - const: mdp - - const: vbif - - clocks: - items: - - description: Display hf axi clock - - description: Display sf axi clock - - description: Display ahb clock - - description: Display lut clock - - description: Display core clock - - description: Display vsync clock - - clock-names: - items: - - const: bus - - const: nrt_bus - - const: iface - - const: lut - - const: core - - const: vsync - - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI) - - port@1: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF5 (EDP) - - required: - - port@0 + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF1 (DSI) + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF5 (EDP) required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports + - port@0 required: - compatible - reg - reg-names - - power-domains - clocks - interrupts - - interrupt-controller - - iommus - - ranges + - power-domains + - operating-points-v2 + - ports additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/msm/mdss.yaml b/Documentation/devicetree/bindings/display/msm/mdss.yaml index 98f1f2501291..b1c7193417be 100644 --- a/Documentation/devicetree/bindings/display/msm/mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/mdss.yaml @@ -18,6 +18,7 @@ properties: compatible: enum: - qcom,sc7180-mdss + - qcom,sc7280-mdss - qcom,sdm845-mdss - qcom,mdss @@ -167,6 +168,7 @@ allOf: contains: enum: - qcom,sc7180-mdss + - qcom,sc7280-mdss then: properties: clocks: @@ -206,6 +208,7 @@ patternProperties: "^display-controller@(0|[1-9a-f][0-9a-f]*)$": oneOf: - $ref: dpu-sc7180.yaml + - $ref: dpu-sc7280.yaml - $ref: dpu-sdm845.yaml "^displayport-controller@(0|[1-9a-f][0-9a-f]*)$": @@ -229,6 +232,14 @@ patternProperties: - $ref: dsi-phy-10nm.yaml# - $ref: dsi-phy-7nm.yaml# + "^edp@(0|[1-9a-f][0-9a-f]*)$": + type: object + properties: + compatible: + enum: + - qcom,sc7280-edp + - qcom,sc8180x-edp + "^hdmi-phy@(0|[1-9a-f][0-9a-f]*)$": oneOf: - $ref: /schemas/phy/qcom,hdmi-phy-qmp.yaml# @@ -237,6 +248,14 @@ patternProperties: "^hdmi-tx@(0|[1-9a-f][0-9a-f]*)$": $ref: hdmi.yaml# + "^phy@(0|[1-9a-f][0-9a-f]*)$": + type: object + properties: + compatible: + enum: + - qcom,sc7280-dsi-phy-7nm + - qcom,sc7280-edp-phy + additionalProperties: false examples: -- 2.35.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8094CC433EF for ; Sun, 10 Jul 2022 09:01:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BD44113222; Sun, 10 Jul 2022 09:00:51 +0000 (UTC) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 919001125D1 for ; Sun, 10 Jul 2022 09:00:48 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id r9so3034565ljp.9 for ; Sun, 10 Jul 2022 02:00:48 -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=gEMMqx0XbkclJMa1x7CL7VRmLmoJRkTMt6HpqiUHQfQ=; b=HBoXaaFa9rDG4G+nf7K4XUnOSX7mbz3qdBOj67DchbRDTj8ZMEa8Jm4zMXvfXdztp1 d/3WkQ2Y7wLlwyEuhtqFYmj6oaLqg4x9FiPysDZM4SUxeFRPzjJuZwvdr60hhMruCBe8 IwDasbvgt4MqQ++QYW0Sopd8OYMVkmFMoaZN0CruDqV9WbJKG3xDYO0EiD1BUSL6odOZ 5p9lCGVowQASsT+C2dqIFTSf2DINNqxJv+wL8V9hhKQR0XYSf1a+IP84ZrFhgku1R/1U uLht6RZkKq+K6tlJnWlv1otUUsRqPMO2rNU48TmzDvX8tuzWey+vzMKXkwkGGUoD+qdK GtXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gEMMqx0XbkclJMa1x7CL7VRmLmoJRkTMt6HpqiUHQfQ=; b=GocOmst2SFSgSwG5A0/A9pEmpV5jSHb372QxhZfYWxXhuogYRNAONdn6YlqEzUDmbf UmkTjDXeaJqCCZDl6NjVeVtyeY+i1qzXbzadygCAk79aVJw6m9YKtoIJdZYuRRslfdZU ruzdmxpiwzbsCMfaYjHPfpzRIW7J+n0MHd6cjn5QB7nBWR5OxUQqcj5ljb+8lYgiWYLc XnT187EDkkD/tyXGRFDyPPWMuQ4wZKsYVk7pd9ddzGOGM1Plj4Y1Bdv/nuhDB3ZI9gmy S19AAowI34/4RyvPwiUJh76KV2CsRmknOF/+JK/eqSc4NQimestqNja4LQMnPE/W7Jj6 bGuA== X-Gm-Message-State: AJIora+EM2F7QZgxmWvw8LHaXD3MCRO32yrwyKmdpK9RUeTxn/XElXoO kpy7nz8cc+erf/7FTDZwGnSRxQ== X-Google-Smtp-Source: AGRyM1vVkIO5gPaIqWKylhRxsvc75vQkC1Wgz7syaWB2rBv3bGc0tT9Y+rgQ3bts9DuLTKnl4IqXPw== X-Received: by 2002:a05:651c:211f:b0:25a:86c4:bfe4 with SMTP id a31-20020a05651c211f00b0025a86c4bfe4mr7046997ljq.531.1657443646884; Sun, 10 Jul 2022 02:00:46 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id u16-20020a056512095000b004896b58f2fasm822881lft.270.2022.07.10.02.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jul 2022 02:00:46 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Clark , Sean Paul , Abhinav Kumar , Rob Herring , Krzysztof Kozlowski Subject: [PATCH v2 07/11] dt-bindings: display/msm: move qcom, sc7280-mdss schema to mdss.yaml Date: Sun, 10 Jul 2022 12:00:36 +0300 Message-Id: <20220710090040.35193-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220710090040.35193-1-dmitry.baryshkov@linaro.org> References: <20220710090040.35193-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Stephen Boyd , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Move schema for qcom,sc7280-mdss from dpu-sc7280.yaml to mdss.yaml so that the dpu file describes only the DPU schema. Signed-off-by: Dmitry Baryshkov --- .../bindings/display/msm/dpu-sc7280.yaml | 148 +++++------------- .../devicetree/bindings/display/msm/mdss.yaml | 19 +++ 2 files changed, 57 insertions(+), 110 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml index f427eec3d3a4..349a454099ad 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-sc7280.yaml @@ -10,149 +10,77 @@ maintainers: - Krishna Manikandan description: | - Device tree bindings for MSM Mobile Display Subsystem (MDSS) that encapsulates - sub-blocks like DPU display controller, DSI and DP interfaces etc. Device tree - bindings of MDSS and DPU are mentioned for SC7280. + Device tree bindings for the DPU display controller for SC7280 target. properties: compatible: - const: qcom,sc7280-mdss + const: qcom,sc7280-dpu reg: - maxItems: 1 + items: + - description: Address offset and size for mdp register set + - description: Address offset and size for vbif register set reg-names: - const: mdss - - power-domains: - maxItems: 1 + items: + - const: mdp + - const: vbif clocks: items: - - description: Display AHB clock from gcc - - description: Display AHB clock from dispcc + - description: Display hf axi clock + - description: Display sf axi clock + - description: Display ahb clock + - description: Display lut clock - description: Display core clock + - description: Display vsync clock clock-names: items: + - const: bus + - const: nrt_bus - const: iface - - const: ahb + - const: lut - const: core + - const: vsync interrupts: maxItems: 1 - interrupt-controller: true - - "#address-cells": true - - "#size-cells": true - - "#interrupt-cells": - const: 1 - - iommus: - items: - - description: Phandle to apps_smmu node with SID mask for Hard-Fail port0 - - ranges: true - - interconnects: - items: - - description: Interconnect path specifying the port ids for data bus - - interconnect-names: - const: mdp0-mem + power-domains: + maxItems: 1 - resets: - items: - - description: MDSS_CORE reset + operating-points-v2: true -patternProperties: - "^display-controller@[0-9a-f]+$": - type: object - description: Node containing the properties of DPU. + ports: + $ref: /schemas/graph.yaml#/properties/ports + description: | + Contains the list of output ports from DPU device. These ports + connect to interfaces that are external to the DPU hardware, + such as DSI, DP etc. Each output port contains an endpoint that + describes how it is connected to an external interface. properties: - compatible: - const: qcom,sc7280-dpu - - reg: - items: - - description: Address offset and size for mdp register set - - description: Address offset and size for vbif register set - - reg-names: - items: - - const: mdp - - const: vbif - - clocks: - items: - - description: Display hf axi clock - - description: Display sf axi clock - - description: Display ahb clock - - description: Display lut clock - - description: Display core clock - - description: Display vsync clock - - clock-names: - items: - - const: bus - - const: nrt_bus - - const: iface - - const: lut - - const: core - - const: vsync - - interrupts: - maxItems: 1 - - power-domains: - maxItems: 1 - - operating-points-v2: true - - ports: - $ref: /schemas/graph.yaml#/properties/ports - description: | - Contains the list of output ports from DPU device. These ports - connect to interfaces that are external to the DPU hardware, - such as DSI, DP etc. Each output port contains an endpoint that - describes how it is connected to an external interface. - - properties: - port@0: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF1 (DSI) - - port@1: - $ref: /schemas/graph.yaml#/properties/port - description: DPU_INTF5 (EDP) - - required: - - port@0 + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF1 (DSI) + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF5 (EDP) required: - - compatible - - reg - - reg-names - - clocks - - interrupts - - power-domains - - operating-points-v2 - - ports + - port@0 required: - compatible - reg - reg-names - - power-domains - clocks - interrupts - - interrupt-controller - - iommus - - ranges + - power-domains + - operating-points-v2 + - ports additionalProperties: false diff --git a/Documentation/devicetree/bindings/display/msm/mdss.yaml b/Documentation/devicetree/bindings/display/msm/mdss.yaml index 98f1f2501291..b1c7193417be 100644 --- a/Documentation/devicetree/bindings/display/msm/mdss.yaml +++ b/Documentation/devicetree/bindings/display/msm/mdss.yaml @@ -18,6 +18,7 @@ properties: compatible: enum: - qcom,sc7180-mdss + - qcom,sc7280-mdss - qcom,sdm845-mdss - qcom,mdss @@ -167,6 +168,7 @@ allOf: contains: enum: - qcom,sc7180-mdss + - qcom,sc7280-mdss then: properties: clocks: @@ -206,6 +208,7 @@ patternProperties: "^display-controller@(0|[1-9a-f][0-9a-f]*)$": oneOf: - $ref: dpu-sc7180.yaml + - $ref: dpu-sc7280.yaml - $ref: dpu-sdm845.yaml "^displayport-controller@(0|[1-9a-f][0-9a-f]*)$": @@ -229,6 +232,14 @@ patternProperties: - $ref: dsi-phy-10nm.yaml# - $ref: dsi-phy-7nm.yaml# + "^edp@(0|[1-9a-f][0-9a-f]*)$": + type: object + properties: + compatible: + enum: + - qcom,sc7280-edp + - qcom,sc8180x-edp + "^hdmi-phy@(0|[1-9a-f][0-9a-f]*)$": oneOf: - $ref: /schemas/phy/qcom,hdmi-phy-qmp.yaml# @@ -237,6 +248,14 @@ patternProperties: "^hdmi-tx@(0|[1-9a-f][0-9a-f]*)$": $ref: hdmi.yaml# + "^phy@(0|[1-9a-f][0-9a-f]*)$": + type: object + properties: + compatible: + enum: + - qcom,sc7280-dsi-phy-7nm + - qcom,sc7280-edp-phy + additionalProperties: false examples: -- 2.35.1