| Message ID | 20231222174220.55249-2-knaerzche@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4ec295efef1ac4969a9667b40e1e91fa45d90c4a |
| Headers | show |
| Series | Add HDMI support for RK3128 | expand |
Am Freitag, 22. Dezember 2023, 18:41:52 CET schrieb Alex Bee: > The integration for this SoC is different from the currently existing: It > needs it's PHY's reference clock rate to calculate the DDC bus frequency > correctly. The controller is also part of a powerdomain, so this gets added > as an mandatory property for this variant. > > Signed-off-by: Alex Bee <knaerzche@gmail.com> > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> this is just a note to myself: The binding conversion to yaml was picked by Rob in [0], so will most likely be part of 6.8-rc1, so this will need to wait until 6.8-rc1 gets into drm-misc-next . Heiko [0] https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=for-next&id=7048708fec3a401f9a70e4a74e2e12aa7f88c132 > --- > changes in v2: > - clarify that the controller itself is part of the powerdomain > - simplify clock-names > - made power-domains property only allowed (and required) for new variant > > changes in v3: > - collect RB > > changes in v4: > - none > > .../display/rockchip/rockchip,inno-hdmi.yaml | 40 ++++++++++++++++++- > 1 file changed, 38 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml > index 96889c86849a..be78dcfa1c76 100644 > --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml > +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml > @@ -14,6 +14,7 @@ properties: > compatible: > enum: > - rockchip,rk3036-inno-hdmi > + - rockchip,rk3128-inno-hdmi > > reg: > maxItems: 1 > @@ -22,10 +23,19 @@ properties: > maxItems: 1 > > clocks: > - maxItems: 1 > + minItems: 1 > + items: > + - description: The HDMI controller main clock > + - description: The HDMI PHY reference clock > > clock-names: > - const: pclk > + minItems: 1 > + items: > + - const: pclk > + - const: ref > + > + power-domains: > + maxItems: 1 > > ports: > $ref: /schemas/graph.yaml#/properties/ports > @@ -55,6 +65,32 @@ required: > - pinctrl-names > - ports > > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3036-inno-hdmi > + > + then: > + properties: > + power-domains: false > + > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3128-inno-hdmi > + > + then: > + properties: > + clocks: > + minItems: 2 > + clock-names: > + minItems: 2 > + required: > + - power-domains > + > additionalProperties: false > > examples: >
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml index 96889c86849a..be78dcfa1c76 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,inno-hdmi.yaml @@ -14,6 +14,7 @@ properties: compatible: enum: - rockchip,rk3036-inno-hdmi + - rockchip,rk3128-inno-hdmi reg: maxItems: 1 @@ -22,10 +23,19 @@ properties: maxItems: 1 clocks: - maxItems: 1 + minItems: 1 + items: + - description: The HDMI controller main clock + - description: The HDMI PHY reference clock clock-names: - const: pclk + minItems: 1 + items: + - const: pclk + - const: ref + + power-domains: + maxItems: 1 ports: $ref: /schemas/graph.yaml#/properties/ports @@ -55,6 +65,32 @@ required: - pinctrl-names - ports +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,rk3036-inno-hdmi + + then: + properties: + power-domains: false + + - if: + properties: + compatible: + contains: + const: rockchip,rk3128-inno-hdmi + + then: + properties: + clocks: + minItems: 2 + clock-names: + minItems: 2 + required: + - power-domains + additionalProperties: false examples: