Current port description doesn't cover all possible cases. It currently expects one single port with two endpoints.
When the HDMI connector is described in the device tree there can be two ports, first one going to the VOP and the second one going to the connector.
Also on SoCs which only have a single VOP there will be only one endpoint instead of two.
This patch addresses both issues. With this there can either be a single port ("port") , or two of them ("port@0", "port@1") when the connector is also in the device tree. Also the first or only port can either have one endpoint ("endpoint") for single VOP SoCs or two ("endpoint@0", "endpoint@1") for dual VOP SoCs.
Signed-off-by: Sascha Hauer s.hauer@pengutronix.de Reviewed-by: Rob Herring robh@kernel.org ---
Notes: Changes since v6: - Add Reviewed-by: Rob Herring robh@kernel.org Changes since v5: - new patch
Changes since v7: - Drop unnecessary hclk
Changes since v5: - Drop unnecessary #size-cells/#address-cells from nodes with only single endpoint
.../display/rockchip/rockchip,dw-hdmi.yaml | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml index ff5cf9fe20904..1f2fd579c510e 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml @@ -102,27 +102,21 @@ properties: ports: $ref: /schemas/graph.yaml#/properties/ports
- properties: - port: - $ref: /schemas/graph.yaml#/$defs/port-base - unevaluatedProperties: false + patternProperties: + "^port(@0)?$": + $ref: /schemas/graph.yaml#/properties/port description: Input of the DWC HDMI TX - properties: + endpoint: + description: Connection to the VOP endpoint@0: - $ref: /schemas/graph.yaml#/properties/endpoint description: Connection to the VOPB - endpoint@1: - $ref: /schemas/graph.yaml#/properties/endpoint description: Connection to the VOPL - - required: - - endpoint@0 - - endpoint@1 - - required: - - port + properties: + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: Output of the DWC HDMI TX
rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle