| Message ID | 20241231090802.251787-9-andyshrk@163.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | VOP Support for rk3576 | expand |
On Tue, Dec 31, 2024 at 05:07:51PM +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > Add vop found on rk3576, the main difference between rk3576 and the > previous vop is that each VP has its own interrupt line. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > > --- > > Changes in v8: > - Fix dt_binding_check errors > - ordered by soc name > - Link to the previous version: > https://lore.kernel.org/linux-rockchip/6pn3qjxotdtpzucpul24yro7ppddezwuizneovqvmgdwyv2j7p@ztg4mqyiqmjf/T/#u > > Changes in v4: > - describe constraint SOC by SOC, as interrupts of rk3576 is very > different from others > - Drop Krzysztof's Reviewed-by, as this version changed a lot. > > Changes in v3: > - ordered by soc name > - Add description for newly added interrupt > > Changes in v2: > - Add dt bindings > > .../display/rockchip/rockchip-vop2.yaml | 81 ++++++++++++++----- > 1 file changed, 63 insertions(+), 18 deletions(-) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml > index 2531726af306..4cdd9cced10c 100644 > --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml > +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml > @@ -20,6 +20,7 @@ properties: > enum: > - rockchip,rk3566-vop > - rockchip,rk3568-vop > + - rockchip,rk3576-vop > - rockchip,rk3588-vop > > reg: > @@ -37,10 +38,21 @@ properties: > - const: gamma-lut > > interrupts: > - maxItems: 1 > + minItems: 1 > + maxItems: 4 > description: > - The VOP interrupt is shared by several interrupt sources, such as > - frame start (VSYNC), line flag and other status interrupts. > + For VOP version under rk3576, the interrupt is shared by several interrupt > + sources, such as frame start (VSYNC), line flag and other interrupt status. > + For VOP version from rk3576 there is a system interrupt for bus error, and > + every video port has it's independent interrupts for vsync and other video > + port related error interrupts. > + > + interrupt-names: > + items: > + - const: vop-sys > + - const: vop-vp0 > + - const: vop-vp1 > + - const: vop-vp2 Drop 'vop-' as it is redundant. > > # See compatible-specific constraints below. > clocks: > @@ -120,43 +132,76 @@ allOf: > properties: > compatible: > contains: > - const: rockchip,rk3588-vop > + enum: > + - rockchip,rk3566-vop > + - rockchip,rk3568-vop > then: > properties: > clocks: > - minItems: 7 > + minItems: 5 > clock-names: > - minItems: 7 > - Keep the blank line between DT properties > + minItems: 5 > ports: > required: > - port@0 > - port@1 > - port@2 > - - port@3 > > + - if: > + properties: > + compatible: > + contains: > + enum: > + - rockchip,rk3576-vop > + then: > + properties: > + clocks: > + minItems: 5 blank line > + clock-names: > + minItems: 5 blank line, and so on. > + ports: > + required: > + - port@0 > + - port@1 > + - port@2 > + interrupts: > + items: > + - description: vop system interrupt, such as axi bus error > + - description: interrupts for video port0, such as vsync, dsp_hold. > + - description: interrupts for video port1, such as vsync, dsp_hold. > + - description: interrupts for video port2, such as vsync, dsp_hold. These descriptions belong at the top level. > + interrupt-names: > + items: > + - const: vop-sys > + - const: vop-vp0 > + - const: vop-vp1 > + - const: vop-vp2 Why are these names defined twice? You just need 'minItems: 4' in both of these. > required: > - rockchip,grf > - - rockchip,vo1-grf > - - rockchip,vop-grf > - rockchip,pmu > > - else: > + - if: > + properties: > + compatible: > + contains: > + const: rockchip,rk3588-vop > + then: > properties: > - rockchip,vo1-grf: false > - rockchip,vop-grf: false > - rockchip,pmu: false How is there no long a case without these properties? > - > clocks: > - maxItems: 5 > + minItems: 7 > clock-names: > - maxItems: 5 > - > + minItems: 7 > ports: > required: > - port@0 > - port@1 > - port@2 > + - port@3 > + required: > + - rockchip,grf > + - rockchip,vo1-grf > + - rockchip,vop-grf > + - rockchip,pmu > > additionalProperties: false > > -- > 2.34.1 >
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml index 2531726af306..4cdd9cced10c 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml @@ -20,6 +20,7 @@ properties: enum: - rockchip,rk3566-vop - rockchip,rk3568-vop + - rockchip,rk3576-vop - rockchip,rk3588-vop reg: @@ -37,10 +38,21 @@ properties: - const: gamma-lut interrupts: - maxItems: 1 + minItems: 1 + maxItems: 4 description: - The VOP interrupt is shared by several interrupt sources, such as - frame start (VSYNC), line flag and other status interrupts. + For VOP version under rk3576, the interrupt is shared by several interrupt + sources, such as frame start (VSYNC), line flag and other interrupt status. + For VOP version from rk3576 there is a system interrupt for bus error, and + every video port has it's independent interrupts for vsync and other video + port related error interrupts. + + interrupt-names: + items: + - const: vop-sys + - const: vop-vp0 + - const: vop-vp1 + - const: vop-vp2 # See compatible-specific constraints below. clocks: @@ -120,43 +132,76 @@ allOf: properties: compatible: contains: - const: rockchip,rk3588-vop + enum: + - rockchip,rk3566-vop + - rockchip,rk3568-vop then: properties: clocks: - minItems: 7 + minItems: 5 clock-names: - minItems: 7 - + minItems: 5 ports: required: - port@0 - port@1 - port@2 - - port@3 + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3576-vop + then: + properties: + clocks: + minItems: 5 + clock-names: + minItems: 5 + ports: + required: + - port@0 + - port@1 + - port@2 + interrupts: + items: + - description: vop system interrupt, such as axi bus error + - description: interrupts for video port0, such as vsync, dsp_hold. + - description: interrupts for video port1, such as vsync, dsp_hold. + - description: interrupts for video port2, such as vsync, dsp_hold. + interrupt-names: + items: + - const: vop-sys + - const: vop-vp0 + - const: vop-vp1 + - const: vop-vp2 required: - rockchip,grf - - rockchip,vo1-grf - - rockchip,vop-grf - rockchip,pmu - else: + - if: + properties: + compatible: + contains: + const: rockchip,rk3588-vop + then: properties: - rockchip,vo1-grf: false - rockchip,vop-grf: false - rockchip,pmu: false - clocks: - maxItems: 5 + minItems: 7 clock-names: - maxItems: 5 - + minItems: 7 ports: required: - port@0 - port@1 - port@2 + - port@3 + required: + - rockchip,grf + - rockchip,vo1-grf + - rockchip,vop-grf + - rockchip,pmu additionalProperties: false