From patchwork Tue Jun 30 20:02:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 192099 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4177115ilg; Tue, 30 Jun 2020 13:02:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeM7TLikquCQNjFTlD8mWSjUI6ergqZTBc4PeETI4Rvqmb7OSE0WfrHwelqOAlh1r7/4WB X-Received: by 2002:a62:640b:: with SMTP id y11mr20132271pfb.195.1593547342641; Tue, 30 Jun 2020 13:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593547342; cv=none; d=google.com; s=arc-20160816; b=YCNGB3I6p634A9taoTjdhA5C9DGvBmz5BMi108fj3CI4mfWEP/ktOIbk+VEdoFp7DF x40JMC3Qy9+ssGaZguWLvDnn6fe8gvhQoZqn63n56VIr4qxPc2EDjywCvN+0ubW+cZ63 bQLU1TomLXsezaYx3X5z9WOPsG7QkQ+oNgR3oGK5fds4H+AojY0t3ceV0mkAJC9Xy6EC JGaFWJKOwJ+YxVGd5Ja4/voibZwIZWgfdOie1opHPGKRxgEqwnOfPvPYlrTlqbu4hEIr CRb2M67tV1Q6fnWn0s9FGQXwHwrCrla9CMxalQgc7Ex0d8QH7uvFPsScBr/t9lM7yLnp RbSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=E6I5P+EFvP8wGBOSGLeXX/a5y/isAKpmd+Io1n2sGmQ=; b=rU7f9gJycZH3erAsR3KsH9alj3fdwGKrChHFdTIMk4qofQfVEmYMuLf1R2P2fLp11L pMtPnn8HOSL0VFdWcexg1983YvwSGZoooWv3KVUtylrCX8kg+kLbJ6ecaNnPX/WKn/Fe v6TxNno5LTmjiKXtemTVO05oqXS6/1MMUtnjp9KI+BnJ3XVswYKUhrgw5vk0lFzGPIyD 0xovTJVBJcPDwCLDzChEtkhqEiB7/u1bVKEje91Evcw7Xnq2hO5X+j/smt4ybONbupMm GxCiJ8gUKwwn54ZRWHa0002dGKyNHIln229utiSGGmi1Ok1PivXS8/p+TWThLfTZq/JO xzig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id t21si2433554pjr.92.2020.06.30.13.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:02:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 849EB6E1A2; Tue, 30 Jun 2020 20:02:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 16ECB6E1A5 for ; Tue, 30 Jun 2020 20:02:20 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id o3so1527378ilo.12 for ; Tue, 30 Jun 2020 13:02:20 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=ZkIYc/eqbgOWONYFCr/80s2mn+xe0bQWV+Ub3u8lp/o=; b=ooNiVLVPOp74ajUI+PnvXQazMP57B+jtzBvTK9Qxe2V8ogNZSfFsoSo2f0UuUaGJNR qgx8XEak0CfJo7RtK9tRsZoS5DF5zqwBfa7MaGt+jX69DF49tLpDQrO4/S6JGYf80cER 8SlontR9QyJ4n3ANRjNq1zXqPbbyyhAwBMDr0eBeXk2mFe2jsyDSbmGFFfBMEa1nxGQh 6uA+315Azr7RuPf0BMk/xQfHGdEH9tHNV6yT1f22ftIDZqSrlweDThMsP2ngojBTDH+q gIbrU7+mseMK0SB4bqRMCDbsx8mBQOm8WsO1hvRzqapIh8NxbXdOXSFX5H3qTaCXtJP9 64Mg== X-Gm-Message-State: AOAM530XmiXi1qb8Ex/yikndVlxO12y8ekONRHJqbSI0zWpdaZ0tCZyi 1ajdNl7/ctoP+11973kk9CnXKz3Y/g== X-Received: by 2002:a92:a1cf:: with SMTP id b76mr4141625ill.128.1593547338345; Tue, 30 Jun 2020 13:02:18 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.255]) by smtp.googlemail.com with ESMTPSA id u11sm1903512iob.43.2020.06.30.13.02.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 13:02:17 -0700 (PDT) From: Rob Herring To: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2] dt-bindings: display: Convert connectors to DT schema Date: Tue, 30 Jun 2020 14:02:16 -0600 Message-Id: <20200630200216.1172566-1-robh@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: Sam Ravnborg , linux-kernel@vger.kernel.org, Laurent Pinchart Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Convert the analog TV, DVI, HDMI, and VGA connector bindings to DT schema format. Cc: Sam Ravnborg Cc: Laurent Pinchart Cc: Maxime Ripard Signed-off-by: Rob Herring --- v2: - Make Laurent maintainer - Add missing port and compatible required - Drop copy-n-paste 'type' from dvi-connector - Use 4 space indent on examples --- .../display/connector/analog-tv-connector.txt | 31 -------- .../connector/analog-tv-connector.yaml | 52 ++++++++++++++ .../display/connector/dvi-connector.txt | 36 ---------- .../display/connector/dvi-connector.yaml | 70 +++++++++++++++++++ .../display/connector/hdmi-connector.txt | 31 -------- .../display/connector/hdmi-connector.yaml | 64 +++++++++++++++++ .../display/connector/vga-connector.txt | 36 ---------- .../display/connector/vga-connector.yaml | 46 ++++++++++++ 8 files changed, 232 insertions(+), 134 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt create mode 100644 Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml delete mode 100644 Documentation/devicetree/bindings/display/connector/dvi-connector.txt create mode 100644 Documentation/devicetree/bindings/display/connector/dvi-connector.yaml delete mode 100644 Documentation/devicetree/bindings/display/connector/hdmi-connector.txt create mode 100644 Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml delete mode 100644 Documentation/devicetree/bindings/display/connector/vga-connector.txt create mode 100644 Documentation/devicetree/bindings/display/connector/vga-connector.yaml -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Acked-by: Sam Ravnborg Reviewed-by: Sam Ravnborg diff --git a/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt deleted file mode 100644 index 883bcb2604c7..000000000000 --- a/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt +++ /dev/null @@ -1,31 +0,0 @@ -Analog TV Connector -=================== - -Required properties: -- compatible: "composite-video-connector" or "svideo-connector" - -Optional properties: -- label: a symbolic name for the connector -- sdtv-standards: limit the supported TV standards on a connector to the given - ones. If not specified all TV standards are allowed. - Possible TV standards are defined in - include/dt-bindings/display/sdtv-standards.h. - -Required nodes: -- Video port for TV input - -Example -------- -#include - -tv: connector { - compatible = "composite-video-connector"; - label = "tv"; - sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>; - - port { - tv_connector_in: endpoint { - remote-endpoint = <&venc_out>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml new file mode 100644 index 000000000000..eebe88fed999 --- /dev/null +++ b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.yaml @@ -0,0 +1,52 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/connector/analog-tv-connector.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog TV Connector + +maintainers: + - Laurent Pinchart + +properties: + compatible: + enum: + - composite-video-connector + - svideo-connector + + label: true + + sdtv-standards: + description: + Limit the supported TV standards on a connector to the given ones. If + not specified all TV standards are allowed. Possible TV standards are + defined in include/dt-bindings/display/sdtv-standards.h. + $ref: /schemas/types.yaml#/definitions/uint32 + + port: + description: Connection to controller providing analog TV signals + +required: + - compatible + - port + +additionalProperties: false + +examples: + - | + #include + + connector { + compatible = "composite-video-connector"; + label = "tv"; + sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>; + + port { + tv_connector_in: endpoint { + remote-endpoint = <&venc_out>; + }; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/display/connector/dvi-connector.txt b/Documentation/devicetree/bindings/display/connector/dvi-connector.txt deleted file mode 100644 index 207e42e9eba0..000000000000 --- a/Documentation/devicetree/bindings/display/connector/dvi-connector.txt +++ /dev/null @@ -1,36 +0,0 @@ -DVI Connector -============== - -Required properties: -- compatible: "dvi-connector" - -Optional properties: -- label: a symbolic name for the connector -- ddc-i2c-bus: phandle to the i2c bus that is connected to DVI DDC -- analog: the connector has DVI analog pins -- digital: the connector has DVI digital pins -- dual-link: the connector has pins for DVI dual-link -- hpd-gpios: HPD GPIO number - -Required nodes: -- Video port for DVI input - -Note: One (or both) of 'analog' or 'digital' must be set. - -Example -------- - -dvi0: connector@0 { - compatible = "dvi-connector"; - label = "dvi"; - - digital; - - ddc-i2c-bus = <&i2c3>; - - port { - dvi_connector_in: endpoint { - remote-endpoint = <&tfp410_out>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/display/connector/dvi-connector.yaml b/Documentation/devicetree/bindings/display/connector/dvi-connector.yaml new file mode 100644 index 000000000000..71cb9220fa59 --- /dev/null +++ b/Documentation/devicetree/bindings/display/connector/dvi-connector.yaml @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/connector/dvi-connector.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: DVI Connector + +maintainers: + - Laurent Pinchart + +properties: + compatible: + const: dvi-connector + + label: true + + hpd-gpios: + description: A GPIO line connected to HPD + maxItems: 1 + + ddc-i2c-bus: + description: phandle link to the I2C controller used for DDC EDID probing + $ref: /schemas/types.yaml#/definitions/phandle + + analog: + type: boolean + description: the connector has DVI analog pins + + digital: + type: boolean + description: the connector has DVI digital pins + + dual-link: + type: boolean + description: the connector has pins for DVI dual-link + + port: + description: Connection to controller providing DVI signals + +required: + - compatible + - port + +anyOf: + - required: + - analog + - required: + - digital + +additionalProperties: false + +examples: + - | + connector { + compatible = "dvi-connector"; + label = "dvi"; + + digital; + + ddc-i2c-bus = <&i2c3>; + + port { + dvi_connector_in: endpoint { + remote-endpoint = <&tfp410_out>; + }; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt b/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt deleted file mode 100644 index aeb07c4bd703..000000000000 --- a/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt +++ /dev/null @@ -1,31 +0,0 @@ -HDMI Connector -============== - -Required properties: -- compatible: "hdmi-connector" -- type: the HDMI connector type: "a", "b", "c", "d" or "e" - -Optional properties: -- label: a symbolic name for the connector -- hpd-gpios: HPD GPIO number -- ddc-i2c-bus: phandle link to the I2C controller used for DDC EDID probing -- ddc-en-gpios: signal to enable DDC bus - -Required nodes: -- Video port for HDMI input - -Example -------- - -hdmi0: connector@1 { - compatible = "hdmi-connector"; - label = "hdmi"; - - type = "a"; - - port { - hdmi_connector_in: endpoint { - remote-endpoint = <&tpd12s015_out>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml b/Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml new file mode 100644 index 000000000000..14d7128af592 --- /dev/null +++ b/Documentation/devicetree/bindings/display/connector/hdmi-connector.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/connector/hdmi-connector.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HDMI Connector + +maintainers: + - Laurent Pinchart + +properties: + compatible: + const: hdmi-connector + + type: + description: The HDMI connector type + enum: + - a # Standard full size + - b # Never deployed? + - c # Mini + - d # Micro + - e # automotive + + label: true + + hpd-gpios: + description: A GPIO line connected to HPD + maxItems: 1 + + ddc-i2c-bus: + description: phandle link to the I2C controller used for DDC EDID probing + $ref: /schemas/types.yaml#/definitions/phandle + + ddc-en-gpios: + description: GPIO signal to enable DDC bus + maxItems: 1 + + port: + description: Connection to controller providing HDMI signals + +required: + - compatible + - port + - type + +additionalProperties: false + +examples: + - | + connector { + compatible = "hdmi-connector"; + label = "hdmi"; + + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&tpd12s015_out>; + }; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/display/connector/vga-connector.txt b/Documentation/devicetree/bindings/display/connector/vga-connector.txt deleted file mode 100644 index c727f298e7ad..000000000000 --- a/Documentation/devicetree/bindings/display/connector/vga-connector.txt +++ /dev/null @@ -1,36 +0,0 @@ -VGA Connector -============= - -Required properties: - -- compatible: "vga-connector" - -Optional properties: - -- label: a symbolic name for the connector corresponding to a hardware label -- ddc-i2c-bus: phandle to the I2C bus that is connected to VGA DDC - -Required nodes: - -The VGA connector internal connections are modeled using the OF graph bindings -specified in Documentation/devicetree/bindings/graph.txt. - -The VGA connector has a single port that must be connected to a video source -port. - - -Example -------- - -vga0: connector@0 { - compatible = "vga-connector"; - label = "vga"; - - ddc-i2c-bus = <&i2c3>; - - port { - vga_connector_in: endpoint { - remote-endpoint = <&adv7123_out>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/display/connector/vga-connector.yaml b/Documentation/devicetree/bindings/display/connector/vga-connector.yaml new file mode 100644 index 000000000000..5782c4bb3252 --- /dev/null +++ b/Documentation/devicetree/bindings/display/connector/vga-connector.yaml @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/connector/vga-connector.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: VGA Connector + +maintainers: + - Laurent Pinchart + +properties: + compatible: + const: vga-connector + + label: true + + ddc-i2c-bus: + description: phandle link to the I2C controller used for DDC EDID probing + $ref: /schemas/types.yaml#/definitions/phandle + + port: + description: Connection to controller providing VGA signals + +required: + - compatible + - port + +additionalProperties: false + +examples: + - | + connector { + compatible = "vga-connector"; + label = "vga"; + + ddc-i2c-bus = <&i2c3>; + + port { + vga_connector_in: endpoint { + remote-endpoint = <&adv7123_out>; + }; + }; + }; + +...