| Message ID | a493c65e-7cf9-455f-95d5-8c98cad35710@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0d192c4c72ce00ab07a6b27f068607e21f754a46 |
| Headers | show |
| Series | [v2,1/6] dt-bindings: display: rockchip: rockchip,dw-hdmi: remove port property | expand |
On Wed, Jan 31, 2024 at 10:14:29PM +0100, Johan Jonker wrote: > The hdmi-connector nodes are now functional and the new way to model > hdmi ports nodes with both in and output port subnodes. Unfortunately > with the conversion to YAML the old method with only an input port node > was used. Later the new method was also added to the binding. > A binding must be unambiguously, so remove the old port property > entirely and make port@0 and port@1 a requirement as all > upstream dts files are updated as well and because checking > deprecated stuff is a bit pointless. > Update the example to avoid use of the removed property. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> Acked-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > --- > > Changed V2: > rename title from deprecate to remove > reword > --- > .../display/rockchip/rockchip,dw-hdmi.yaml | 24 +++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml > index 7e59dee15a5f..391c2a7e79de 100644 > --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml > +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml > @@ -97,8 +97,8 @@ properties: > ports: > $ref: /schemas/graph.yaml#/properties/ports > > - patternProperties: > - "^port(@0)?$": > + properties: > + port@0: > $ref: /schemas/graph.yaml#/properties/port > description: Input of the DWC HDMI TX > properties: > @@ -108,11 +108,14 @@ properties: > description: Connection to the VOPB > endpoint@1: > description: Connection to the VOPL > - properties: > port@1: > $ref: /schemas/graph.yaml#/properties/port > description: Output of the DWC HDMI TX > > + required: > + - port@0 > + - port@1 > + > rockchip,grf: > $ref: /schemas/types.yaml#/definitions/phandle > description: > @@ -147,7 +150,11 @@ examples: > clock-names = "iahb", "isfr"; > > ports { > - port { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > #address-cells = <1>; > #size-cells = <0>; > > @@ -155,11 +162,20 @@ examples: > reg = <0>; > remote-endpoint = <&vopb_out_hdmi>; > }; > + > hdmi_in_vopl: endpoint@1 { > reg = <1>; > remote-endpoint = <&vopl_out_hdmi>; > }; > }; > + > + port@1 { > + reg = <1>; > + > + hdmi_out_con: endpoint { > + remote-endpoint = <&hdmi_con_in>; > + }; > + }; > }; > }; > > -- > 2.39.2 >
On Wed, 31 Jan 2024 22:14:29 +0100, Johan Jonker wrote: > The hdmi-connector nodes are now functional and the new way to model > hdmi ports nodes with both in and output port subnodes. Unfortunately > with the conversion to YAML the old method with only an input port node > was used. Later the new method was also added to the binding. > A binding must be unambiguously, so remove the old port property > entirely and make port@0 and port@1 a requirement as all > upstream dts files are updated as well and because checking > deprecated stuff is a bit pointless. > Update the example to avoid use of the removed property. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> > --- > > Changed V2: > rename title from deprecate to remove > reword > --- > .../display/rockchip/rockchip,dw-hdmi.yaml | 24 +++++++++++++++---- > 1 file changed, 20 insertions(+), 4 deletions(-) > Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml index 7e59dee15a5f..391c2a7e79de 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,dw-hdmi.yaml @@ -97,8 +97,8 @@ properties: ports: $ref: /schemas/graph.yaml#/properties/ports - patternProperties: - "^port(@0)?$": + properties: + port@0: $ref: /schemas/graph.yaml#/properties/port description: Input of the DWC HDMI TX properties: @@ -108,11 +108,14 @@ properties: description: Connection to the VOPB endpoint@1: description: Connection to the VOPL - properties: port@1: $ref: /schemas/graph.yaml#/properties/port description: Output of the DWC HDMI TX + required: + - port@0 + - port@1 + rockchip,grf: $ref: /schemas/types.yaml#/definitions/phandle description: @@ -147,7 +150,11 @@ examples: clock-names = "iahb", "isfr"; ports { - port { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; @@ -155,11 +162,20 @@ examples: reg = <0>; remote-endpoint = <&vopb_out_hdmi>; }; + hdmi_in_vopl: endpoint@1 { reg = <1>; remote-endpoint = <&vopl_out_hdmi>; }; }; + + port@1 { + reg = <1>; + + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; + }; }; };
The hdmi-connector nodes are now functional and the new way to model hdmi ports nodes with both in and output port subnodes. Unfortunately with the conversion to YAML the old method with only an input port node was used. Later the new method was also added to the binding. A binding must be unambiguously, so remove the old port property entirely and make port@0 and port@1 a requirement as all upstream dts files are updated as well and because checking deprecated stuff is a bit pointless. Update the example to avoid use of the removed property. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- Changed V2: rename title from deprecate to remove reword --- .../display/rockchip/rockchip,dw-hdmi.yaml | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 2.39.2