From: Andy Yan <andy.yan@rock-chips.com>
The vop2 on rk3588 is similar to which on rk356x
but with 4 video outputs and need to reference
more grf modules.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---
.../display/rockchip/rockchip-vop2.yaml | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
index b60b90472d42..c333c651da1a 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,rk3588-vop
reg:
items:
@@ -48,6 +49,8 @@ properties:
- description: Pixel clock for video port 0.
- description: Pixel clock for video port 1.
- description: Pixel clock for video port 2.
+ - description: Pixel clock for video port 4.
+ - description: Peripheral clock for vop on rk3588.
clock-names:
items:
@@ -56,12 +59,29 @@ properties:
- const: dclk_vp0
- const: dclk_vp1
- const: dclk_vp2
+ - const: dclk_vp3
+ - const: pclk_vop
rockchip,grf:
$ref: /schemas/types.yaml#/definitions/phandle
description:
Phandle to GRF regs used for misc control
+ rockchip,vo-grf:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to VO GRF regs used for misc control, required for rk3588
+
+ rockchip,vop-grf:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to VOP GRF regs used for misc control, required for rk3588
+
+ rockchip,pmu:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to PMU regs used for misc control, required for rk3588
+
ports:
$ref: /schemas/graph.yaml#/properties/ports
@@ -81,6 +101,11 @@ properties:
description:
Output endpoint of VP2
+ port@3:
+ $ref: /schemas/graph.yaml#/properties/port
+ description:
+ Output endpoint of VP3
+
iommus:
maxItems: 1
--
2.34.1
Am Dienstag, 14. November 2023, 12:28:41 CET schrieb Andy Yan: > From: Andy Yan <andy.yan@rock-chips.com> > > The vop2 on rk3588 is similar to which on rk356x > but with 4 video outputs and need to reference > more grf modules. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- > > .../display/rockchip/rockchip-vop2.yaml | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml > index b60b90472d42..c333c651da1a 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,rk3588-vop > > reg: > items: > @@ -48,6 +49,8 @@ properties: > - description: Pixel clock for video port 0. > - description: Pixel clock for video port 1. > - description: Pixel clock for video port 2. > + - description: Pixel clock for video port 4. > + - description: Peripheral clock for vop on rk3588. > > clock-names: > items: > @@ -56,12 +59,29 @@ properties: > - const: dclk_vp0 > - const: dclk_vp1 > - const: dclk_vp2 > + - const: dclk_vp3 > + - const: pclk_vop with the error Rob's bot reported, I guess both clocks and clock-names need a minItems element to mark these new clocks essentially as optional? > rockchip,grf: > $ref: /schemas/types.yaml#/definitions/phandle > description: > Phandle to GRF regs used for misc control > > + rockchip,vo-grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + Phandle to VO GRF regs used for misc control, required for rk3588 > + > + rockchip,vop-grf: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + Phandle to VOP GRF regs used for misc control, required for rk3588 > + > + rockchip,pmu: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + Phandle to PMU regs used for misc control, required for rk3588 > + > ports: > $ref: /schemas/graph.yaml#/properties/ports > > @@ -81,6 +101,11 @@ properties: > description: > Output endpoint of VP2 > > + port@3: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + Output endpoint of VP3 > + > iommus: > maxItems: 1 > >
On 11/15/23 05:54, Heiko Stübner wrote: > Am Dienstag, 14. November 2023, 12:28:41 CET schrieb Andy Yan: >> From: Andy Yan <andy.yan@rock-chips.com> >> >> The vop2 on rk3588 is similar to which on rk356x >> but with 4 video outputs and need to reference >> more grf modules. >> >> Signed-off-by: Andy Yan <andy.yan@rock-chips.com> >> --- >> >> .../display/rockchip/rockchip-vop2.yaml | 25 +++++++++++++++++++ >> 1 file changed, 25 insertions(+) >> >> diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml >> index b60b90472d42..c333c651da1a 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,rk3588-vop >> >> reg: >> items: >> @@ -48,6 +49,8 @@ properties: >> - description: Pixel clock for video port 0. >> - description: Pixel clock for video port 1. >> - description: Pixel clock for video port 2. >> + - description: Pixel clock for video port 4. >> + - description: Peripheral clock for vop on rk3588. >> >> clock-names: >> items: >> @@ -56,12 +59,29 @@ properties: >> - const: dclk_vp0 >> - const: dclk_vp1 >> - const: dclk_vp2 >> + - const: dclk_vp3 >> + - const: pclk_vop > with the error Rob's bot reported, I guess both clocks and clock-names > need a minItems element to mark these new clocks essentially as optional? Yes, when add minItems for clocks and clkock-names, the erro gone. Considering we also have vop2 based soc(rk3562) only have one video port, so it is better to set the minItems as 3 here? > >> rockchip,grf: >> $ref: /schemas/types.yaml#/definitions/phandle >> description: >> Phandle to GRF regs used for misc control >> >> + rockchip,vo-grf: >> + $ref: /schemas/types.yaml#/definitions/phandle >> + description: >> + Phandle to VO GRF regs used for misc control, required for rk3588 >> + >> + rockchip,vop-grf: >> + $ref: /schemas/types.yaml#/definitions/phandle >> + description: >> + Phandle to VOP GRF regs used for misc control, required for rk3588 >> + >> + rockchip,pmu: >> + $ref: /schemas/types.yaml#/definitions/phandle >> + description: >> + Phandle to PMU regs used for misc control, required for rk3588 >> + >> ports: >> $ref: /schemas/graph.yaml#/properties/ports >> >> @@ -81,6 +101,11 @@ properties: >> description: >> Output endpoint of VP2 >> >> + port@3: >> + $ref: /schemas/graph.yaml#/properties/port >> + description: >> + Output endpoint of VP3 >> + >> iommus: >> maxItems: 1 >> >> > > >
On Tue, 14 Nov 2023 19:28:41 +0800, Andy Yan wrote: > From: Andy Yan <andy.yan@rock-chips.com> > > The vop2 on rk3588 is similar to which on rk356x > but with 4 video outputs and need to reference > more grf modules. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- > > .../display/rockchip/rockchip-vop2.yaml | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.example.dtb: vop@fe040000: clocks: [[4294967295, 221], [4294967295, 222], [4294967295, 223], [4294967295, 224], [4294967295, 225]] is too short from schema $id: http://devicetree.org/schemas/display/rockchip/rockchip-vop2.yaml# /builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.example.dtb: vop@fe040000: clock-names: ['aclk', 'hclk', 'dclk_vp0', 'dclk_vp1', 'dclk_vp2'] is too short from schema $id: http://devicetree.org/schemas/display/rockchip/rockchip-vop2.yaml# doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20231114112841.1771312-1-andyshrk@163.com The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
© 2016 - 2025 Red Hat, Inc.