From patchwork Thu Aug 25 09:50:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 600386 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 4A189C28D13 for ; Thu, 25 Aug 2022 09:54:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239534AbiHYJx7 (ORCPT ); Thu, 25 Aug 2022 05:53:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240886AbiHYJxc (ORCPT ); Thu, 25 Aug 2022 05:53:32 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B86CAE224 for ; Thu, 25 Aug 2022 02:51:27 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id z6so27485441lfu.9 for ; Thu, 25 Aug 2022 02:51:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=JdyzHvrHR/vH9GmNxQ6Mi03+luvvo2bX67TCqHVMIMk=; b=LpvC1ovT/tvgBmZp03pj4GyEZhBU1ovJJ/lzjROIerYi7U419VmaRTEELgKJ+J5PvQ ZuwaV6QfZpePD+HdNWLr2NXqiQpNONFH6iR1/B54zAWfaAqOtH6kwVZqCI2DCt5qayGk MgRyXqe43Mr72r/527GEKRR+u1gZGpVDFDS9DTCMho8gnwQqdoJSyjyONYdnY5jR78YF IAbe8PNrXtkS6LfZdfwcr57Bk0D6e1NQk8YQOlKOlfKgLhwtnqLM7qYyqnmCtxPhxoMJ cMf1sSezMH2NLWaciY9AdabscQHu60pBF23heMH0KIcCbLKLfL0cE1BZQFvfbjM+nWwL /1GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=JdyzHvrHR/vH9GmNxQ6Mi03+luvvo2bX67TCqHVMIMk=; b=cM7155cSimb1i11VE94rcJz9EgngRr39sX6GnDx7n8XEDUc9bGfh7Tt1bWMr2SIemB Wh5AmisL2wTkTK4q5RQZ4ITVsN2kLSSqLm6B6J0MQCqajpPMk2FlBBN6A6EFPGlV9QUx sZDOVLI5KErXjlxE+nKmp3kb4KUmSrM0ja7vyiXg2U/ECjlPkbDzcIH2K1yZWZ15iovY VjVxvA9wj3e1NBPDS4iPTvbFg5M31Uw8C1TX0b3zcxu4jtfcr6foClbx8c5mwLfGa18U i5vozWQhRpNeJZ4rAxKjyA7j5qY2WmKCZZCwysoLjcc9fQtVp2Z0UbxlF2VJRdERuqOR NzWw== X-Gm-Message-State: ACgBeo1e7Ie7m6IxJUwEa9GKBAhfe912DAxL03DtWfyn2iXWBfXkUyuD gwiSo466F4SPA8wrKKjn6uy0Vg== X-Google-Smtp-Source: AA6agR6zNrtOAeCK32GslB90L6tlZWCfgwaitQOLWig38n3Zk8QxYHqRP975srLVvN+d6oeGb5w5pA== X-Received: by 2002:a05:6512:3b94:b0:492:bbe1:df3e with SMTP id g20-20020a0565123b9400b00492bbe1df3emr1020837lfv.371.1661421069508; Thu, 25 Aug 2022 02:51:09 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id h10-20020a056512220a00b00492cfecf1c0sm398502lfu.245.2022.08.25.02.51.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 02:51:09 -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 v4 05/10] dt-bindings: display/msm: move qcom,qcm2290-mdss schema to mdss.yaml Date: Thu, 25 Aug 2022 12:50:58 +0300 Message-Id: <20220825095103.624891-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220825095103.624891-1-dmitry.baryshkov@linaro.org> References: <20220825095103.624891-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Move schema for qcom,qcm2290-mdss from dpu-qcm2290.yaml to mdss.yaml so that the dpu file describes only the DPU schema. Signed-off-by: Dmitry Baryshkov --- .../bindings/display/msm/dpu-qcm2290.yaml | 140 +++++------------- .../devicetree/bindings/display/msm/mdss.yaml | 49 ++++++ 2 files changed, 82 insertions(+), 107 deletions(-) diff --git a/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml b/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml index 734d14de966d..8027319b1aad 100644 --- a/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml +++ b/Documentation/devicetree/bindings/display/msm/dpu-qcm2290.yaml @@ -10,146 +10,72 @@ maintainers: - Loic Poulain description: | - Device tree bindings for MSM Mobile Display Subsystem(MDSS) that encapsulates - sub-blocks like DPU display controller and DSI. Device tree bindings of MDSS - and DPU are mentioned for QCM2290 target. + Device tree bindings for the DPU display controller for QCM2290 target. properties: compatible: items: - - const: qcom,qcm2290-mdss + - const: qcom,qcm2290-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 AXI clock - - description: Display core clock + - description: Display AXI clock from gcc + - description: Display AHB clock from dispcc + - description: Display core clock from dispcc + - description: Display lut clock from dispcc + - description: Display vsync clock from dispcc clock-names: items: - - const: iface - const: bus + - const: iface - const: core + - const: lut + - 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 - - description: Phandle to apps_smmu node with SID mask for Hard-Fail port1 - - 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. Each output port contains an endpoint that + describes how it is connected to an external interface. properties: - compatible: - items: - - const: qcom,qcm2290-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 AXI clock from gcc - - description: Display AHB clock from dispcc - - description: Display core clock from dispcc - - description: Display lut clock from dispcc - - description: Display vsync clock from dispcc - - clock-names: - items: - - const: bus - - const: iface - - const: core - - const: lut - - 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. 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 (DSI1) - - required: - - port@0 + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: DPU_INTF1 (DSI1) 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 8d748fc5359c..0c6d68f2a450 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,mdss + - qcom,qcm2290-mdss - qcom,sc7180-mdss - qcom,sc7280-mdss - qcom,sdm845-mdss @@ -142,6 +143,28 @@ allOf: required: - iommus + - if: + properties: + compatible: + contains: + const: qcom,qcm2290-mdss + then: + properties: + clocks: + items: + - description: Display AHB clock from gcc + - description: Display AXI clock + - description: Display core clock + + clock-names: + items: + - const: iface + - const: bus + - const: core + + iommus: + minItems: 2 + - if: properties: compatible: @@ -239,6 +262,32 @@ allOf: - qcom,hdmi-tx-8994 - qcom,hdmi-tx-8996 + - if: + properties: + compatible: + contains: + const: qcom,qcm2290-mdss + then: + patternProperties: + "^display-controller@[1-9a-f][0-9a-f]*$": + type: object + properties: + compatible: + const: qcom,qcm2290-dpu + + "^dsi@[1-9a-f][0-9a-f]*$": + type: object + properties: + compatible: + const: qcom,dsi-ctrl-6g-qcm2290 + + "^phy@[1-9a-f][0-9a-f]*$": + type: object + properties: + compatible: + enum: + - qcom,dsi-phy-14nm + - if: properties: compatible: