| Message ID | 20231204123315.28456-2-keith.zhao@starfivetech.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | DRM driver for verisilicon | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On 04/12/2023 13:33, Keith Zhao wrote: > StarFive SoCs JH7110 display system: > dc controller, hdmi controller, > encoder, vout syscon. Nothing improved here. > > add the path of yaml file in MAINTAINERS Neither here - still these are not proper sentences and wrapping is wrong. Please wrap commit message according to Linux coding style / submission process (neither too early nor over the limit): https://elixir.bootlin.com/linux/v6.4-rc1/source/Documentation/process/submitting-patches.rst#L597 > > Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> > --- > .../starfive/starfive,display-subsystem.yaml | 104 ++++++++++++++++ > .../starfive/starfive,dsi-encoder.yaml | 92 ++++++++++++++ > .../starfive/starfive,jh7110-dc8200.yaml | 113 ++++++++++++++++++ > .../starfive/starfive,jh7110-inno-hdmi.yaml | 82 +++++++++++++ > .../soc/starfive/starfive,jh7110-syscon.yaml | 1 + > MAINTAINERS | 7 ++ > 6 files changed, 399 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml > > diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > new file mode 100644 > index 000000000000..d5ebdba3fb36 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > @@ -0,0 +1,104 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Starfive JH7110 Soc Display SubSystem > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + - ShengYang Chen <shengyang.chen@starfivetech.com> > + > +description: > + This is the bindings documentation for the JH7110 Soc Display Subsystem that Drop "This is the bindings documentation for " because it is obvious. It cannot be anything else. > + includes front-end video data capture, display controller and display > + interface. such as HDMI and MIPI. > + > + JH7110 display pipeline have several components as below description, > + multi display controllers and corresponding physical interfaces. > + For different display scenarios, pipe0 and pipe1 maybe binding to different > + encoder. for example, > + > + pipe0 binding to HDMI for primary display, > + pipe1 binding to DSI for external display. > + > + +------------------------------+ > + | | > + | | > + +----+ | +-------------------+ | +-------+ +------+ +------+ > + | +----->+ dc controller 0 +--->----->+HDMICtl| ->+ PHY +-->+PANEL0+ > + |AXI | | +-------------------+ | +-------+ +------+ +------+ > + | | | | > + | | | | > + | | | | > + | | | | > + |APB | | +-------------------+ +---------+ +------+ +-------+ > + | +----->+ dc controller 1 +--->---->+ dsiTx +--->+DPHY +->+ PANEL1+ > + | | | +-------------------+ +---------+ +------+ +-------+ > + +----+ | | > + +------------------------------+ > + > + > +properties: > + compatible: > + const: starfive,display-subsystem > + > + clocks: > + items: > + - description: Clock for display system noc bus. > + - description: Core clock for display controller. > + - description: Clock for axi bus to access ddr. > + - description: Clock for ahb bus to R/W the phy regs. > + > + clock-names: > + items: > + - const: noc_bus > + - const: dc_core > + - const: axi_core > + - const: ahb > + > + resets: > + items: > + - description: Reset for axi bus. > + - description: Reset for ahb bus. > + - description: Core reset of display controller. > + > + reset-names: > + items: > + - const: axi > + - const: ahb > + - const: core > + > + ports: > + $ref: /schemas/types.yaml#/definitions/phandle-array NAK, you just ignored my comments. More than once in this patchset. I stop review. You must implement entire feedback or respond to it. Especially when ignoring feedback results in buggy code. Best regards, Krzysztof
Hi, On 2023/12/4 20:33, Keith Zhao wrote: > StarFive SoCs JH7110 display system: > dc controller, hdmi controller, > encoder, vout syscon. > > add the path of yaml file in MAINTAINERS > > Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> > --- > .../starfive/starfive,display-subsystem.yaml | 104 ++++++++++++++++ > .../starfive/starfive,dsi-encoder.yaml | 92 ++++++++++++++ > .../starfive/starfive,jh7110-dc8200.yaml | 113 ++++++++++++++++++ > .../starfive/starfive,jh7110-inno-hdmi.yaml | 82 +++++++++++++ > .../soc/starfive/starfive,jh7110-syscon.yaml | 1 + > MAINTAINERS | 7 ++ > 6 files changed, 399 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml > create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml > > diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > new file mode 100644 > index 000000000000..d5ebdba3fb36 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml > @@ -0,0 +1,104 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Starfive JH7110 Soc Display SubSystem > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + - ShengYang Chen <shengyang.chen@starfivetech.com> > + > +description: > + This is the bindings documentation for the JH7110 Soc Display Subsystem that > + includes front-end video data capture, display controller and display > + interface. such as HDMI and MIPI. > + > + JH7110 display pipeline have several components as below description, > + multi display controllers and corresponding physical interfaces. > + For different display scenarios, pipe0 and pipe1 maybe binding to different > + encoder. for example, > + > + pipe0 binding to HDMI for primary display, > + pipe1 binding to DSI for external display. > + > + +------------------------------+ > + | | > + | | > + +----+ | +-------------------+ | +-------+ +------+ +------+ > + | +----->+ dc controller 0 +--->----->+HDMICtl| ->+ PHY +-->+PANEL0+ > + |AXI | | +-------------------+ | +-------+ +------+ +------+ > + | | | | > + | | | | > + | | | | > + | | | | > + |APB | | +-------------------+ +---------+ +------+ +-------+ > + | +----->+ dc controller 1 +--->---->+ dsiTx +--->+DPHY +->+ PANEL1+ > + | | | +-------------------+ +---------+ +------+ +-------+ > + +----+ | | > + +------------------------------+ > + > + > +properties: > + compatible: > + const: starfive,display-subsystem > + > + clocks: > + items: > + - description: Clock for display system noc bus. > + - description: Core clock for display controller. > + - description: Clock for axi bus to access ddr. > + - description: Clock for ahb bus to R/W the phy regs. > + > + clock-names: > + items: > + - const: noc_bus > + - const: dc_core > + - const: axi_core > + - const: ahb > + > + resets: > + items: > + - description: Reset for axi bus. > + - description: Reset for ahb bus. > + - description: Core reset of display controller. > + > + reset-names: > + items: > + - const: axi > + - const: ahb > + - const: core > + > + ports: > + $ref: /schemas/types.yaml#/definitions/phandle-array > + items: > + maxItems: 1 > + description: > + Should contain a list of phandles pointing to display interface port > + of dc-controller devices. > + > +required: > + - compatible > + - clocks > + - clock-names > + - resets > + - reset-names > + - ports > + > +additionalProperties: false > + > +examples: > + - | > + display-subsystem { > + compatible = "starfive,display-subsystem"; > + ports = <&dc_out>; > + > + clocks = <&syscrg 60>, > + <&voutcrg 4>, > + <&voutcrg 5>, > + <&voutcrg 6>; > + clock-names = "noc_bus", "dc_core", "axi_core", "ahb"; > + resets = <&voutcrg 0>, <&voutcrg 1>, <&voutcrg 2>; > + reset-names = "axi", "ahb", "core"; > + }; > diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml > new file mode 100644 > index 000000000000..2cc0ad8e65ba > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml > @@ -0,0 +1,92 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/starfive/starfive,dsi-encoder.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: starfive jh7110 soc Encoder > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + > +description: > + Device-Tree bindings for simple encoder. > + Simple encoder driver only has basic functionality. > + the hardware of dc8200 has 2 output interface, use > + syscon to select which one to be used. > + > +properties: > + compatible: > + const: starfive,dsi-encoder > + > + starfive,syscon: > + $ref: /schemas/types.yaml#/definitions/phandle-array > + items: > + - items: > + - description: phandle to syscon that select crtc output. > + - description: Offset of crtc selection > + - description: Shift of crtc selection > + description: > + A phandle to syscon with two arguments that configure select output. > + The argument one is the offset of crtc selection, the > + argument two is the shift of crtc selection. > + > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + > + properties: > + port@0: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + The first port should be the input coming from the associated dc channel. > + > + port@1: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + The second port should be the output coming from the associated bridge. > + > + required: > + - port@0 > + - port@1 > + > +required: > + - compatible > + - ports > + > +additionalProperties: false > + > +examples: > + - | > + dssctrl: dssctrl@295b0000 { > + compatible = "starfive,jh7110-vout-syscon", "syscon"; > + reg = <0x295b0000 0x90>; > + }; > + > + dsi_encoder: dsi_encoder { > + compatible = "starfive,dsi-encoder"; > + starfive,syscon = <&dssctrl 0x8 0x12>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + /* input */ > + port@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0>; > + dsi_input0:endpoint@0 { > + reg = <0>; > + remote-endpoint = <&dc_out_dpi1>; > + }; > + }; > + /* output */ > + port@1 { > + reg = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + dsi_out:endpoint { > + remote-endpoint = <&mipi_in>; > + }; > + }; > + }; > + }; > diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml > new file mode 100644 > index 000000000000..0b083effec02 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml > @@ -0,0 +1,113 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-dc8200.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: StarFive display controller > + > +description: > + The StarFive SoC uses the display controller based on Verisilicon IP > + to transfer the image data from a video memory buffer to an external > + LCD interface. > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + > +properties: > + compatible: > + const: starfive,jh7110-dc8200 > + > + reg: > + minItems: 1 > + items: > + - description: > + host interface > + - description: > + display physical base address and length. > + > + interrupts: > + items: > + - description: The interrupt will be generated when DC finish one frame > + > + clocks: > + items: > + - description: Pixel clock for display channel 0. > + - description: Pixel clock for display channel 1. > + - description: Pixel clock from hdmi. > + - description: Pixel clock for soc . > + clock-names: > + items: > + - const: channel0 > + - const: channel1 > + - const: hdmi_tx > + - const: dc_parent > + ports: > + $ref: /schemas/graph.yaml#/properties/ports > + > + properties: > + port@0: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + channel 0 output > + > + port@1: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + channel 1 output > + > + required: > + - port@0 > + - port@1 > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - ports > + > +additionalProperties: false > + > +examples: > + - | > + dc8200: lcd-controller@29400000 { > + compatible = "starfive,jh7110-dc8200"; > + reg = <0x29400000 0x100>, <0x29400800 0x2000>; > + interrupts = <95>; > + clocks = <&voutcrg 7>, > + <&voutcrg 8>, > + <&voutcrg 9>, > + <&voutcrg 10>; > + clock-names = "channel0", "channel1","hdmi_tx", "dc_parent"; > + > + crtc_out: ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + dc_out0: port@0 { > + reg = <0>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + dc_out_dpi0: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&hdmi_in_dc>; > + }; > + > + }; > + > + dc_out1: port@1 { > + reg = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + dc_out_dpi1: endpoint@1 { > + reg = <1>; > + remote-endpoint = <&dsi_input0>; > + }; > + > + }; > + }; > + }; > diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml > new file mode 100644 > index 000000000000..3640d97ab789 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml > @@ -0,0 +1,82 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-inno-hdmi.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Starfive JH7110 HDMI controller > + > +description: > + The StarFive JH7110 SoC uses the HDMI signal transmiter based on innosilicon IP 'transmiter' -> 'transmitter' > + to generate HDMI signal from its input and transmit the signal to the screen. > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + > +properties: > + compatible: > + const: "starfive,jh7110-inno-hdmi" > + > + reg: > + minItems: 1 > + > + interrupts: > + items: > + - description: The HDMI hot plug detection interrupt. > + > + clocks: > + items: > + - description: System clock of HDMI module. > + - description: Mclk clock of HDMI audio. > + - description: Bclk clock of HDMI audio. > + > + clock-names: > + items: > + - const: sysclk > + - const: mclk > + - const: bclk > + > + resets: > + maxItems: 1 > + > + '#sound-dai-cells': > + const: 0 > + > + port: > + $ref: /schemas/graph.yaml#/properties/port > + description: > + Should contain a remote endpoint phandle of display controller device. > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - resets > + - '#sound-dai-cells' > + - port > + > +additionalProperties: false > + > +examples: > + - | > + hdmi: hdmi@29590000 { > + compatible = "starfive,jh7110-inno-hdmi"; > + reg = <0x29590000 0x4000>; > + interrupts = <99>; > + clocks = <&voutcrg 17>, > + <&voutcrg 15>, > + <&voutcrg 16>; > + clock-names = "sysclk", "mclk","bclk"; > + resets = <&voutcrg 9>; > + #sound-dai-cells = <0>; > + hdmi_in: port { > + #address-cells = <1>; > + #size-cells = <0>; > + hdmi_in_dc: endpoint@0 { > + reg = <0>; > + remote-endpoint = <&dc_out_hdmi>; > + }; > + }; > + }; > diff --git a/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml b/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml > index 0039319e91fe..cf9b657d0e8a 100644 > --- a/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml > +++ b/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml > @@ -24,6 +24,7 @@ properties: > - enum: > - starfive,jh7110-aon-syscon > - starfive,jh7110-stg-syscon > + - starfive,jh7110-vout-syscon > - const: syscon > > reg: > diff --git a/MAINTAINERS b/MAINTAINERS > index 7b151710e8c5..7caaadb83f3f 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6881,6 +6881,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc > F: Documentation/devicetree/bindings/display/ste,mcde.yaml > F: drivers/gpu/drm/mcde/ > > +DRM DRIVERS FOR STARFIVE > +M: Keith Zhao <keith.zhao@starfivetech.com> > +L: dri-devel@lists.freedesktop.org > +S: Maintained > +T: git git://anongit.freedesktop.org/drm/drm-misc > +F: Documentation/devicetree/bindings/display/starfive/ > + > DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE > M: Jagan Teki <jagan@amarulasolutions.com> > S: Maintained
On Mon, Dec 04, 2023 at 08:33:10PM +0800, Keith Zhao wrote: > StarFive SoCs JH7110 display system: > dc controller, hdmi controller, > encoder, vout syscon. What are yamls? I prefer not using 'yaml' as yaml is lots of things that are not DT schema. Rob
On Wed, Dec 06, 2023 at 08:50:29PM +0800, Sui Jingfeng wrote: > Hi, > > > On 2023/12/4 20:33, Keith Zhao wrote: > > StarFive SoCs JH7110 display system: > > dc controller, hdmi controller, > > encoder, vout syscon. [...] > > +description: > > + The StarFive JH7110 SoC uses the HDMI signal transmiter based on innosilicon IP > > 'transmiter' -> 'transmitter' Thank you for reviewing, but please trim your replies especially when it is only 1 line reply in the middle of 100s of lines. Rob
diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml new file mode 100644 index 000000000000..d5ebdba3fb36 --- /dev/null +++ b/Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml @@ -0,0 +1,104 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,display-subsystem.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive JH7110 Soc Display SubSystem + +maintainers: + - Keith Zhao <keith.zhao@starfivetech.com> + - ShengYang Chen <shengyang.chen@starfivetech.com> + +description: + This is the bindings documentation for the JH7110 Soc Display Subsystem that + includes front-end video data capture, display controller and display + interface. such as HDMI and MIPI. + + JH7110 display pipeline have several components as below description, + multi display controllers and corresponding physical interfaces. + For different display scenarios, pipe0 and pipe1 maybe binding to different + encoder. for example, + + pipe0 binding to HDMI for primary display, + pipe1 binding to DSI for external display. + + +------------------------------+ + | | + | | + +----+ | +-------------------+ | +-------+ +------+ +------+ + | +----->+ dc controller 0 +--->----->+HDMICtl| ->+ PHY +-->+PANEL0+ + |AXI | | +-------------------+ | +-------+ +------+ +------+ + | | | | + | | | | + | | | | + | | | | + |APB | | +-------------------+ +---------+ +------+ +-------+ + | +----->+ dc controller 1 +--->---->+ dsiTx +--->+DPHY +->+ PANEL1+ + | | | +-------------------+ +---------+ +------+ +-------+ + +----+ | | + +------------------------------+ + + +properties: + compatible: + const: starfive,display-subsystem + + clocks: + items: + - description: Clock for display system noc bus. + - description: Core clock for display controller. + - description: Clock for axi bus to access ddr. + - description: Clock for ahb bus to R/W the phy regs. + + clock-names: + items: + - const: noc_bus + - const: dc_core + - const: axi_core + - const: ahb + + resets: + items: + - description: Reset for axi bus. + - description: Reset for ahb bus. + - description: Core reset of display controller. + + reset-names: + items: + - const: axi + - const: ahb + - const: core + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 + description: + Should contain a list of phandles pointing to display interface port + of dc-controller devices. + +required: + - compatible + - clocks + - clock-names + - resets + - reset-names + - ports + +additionalProperties: false + +examples: + - | + display-subsystem { + compatible = "starfive,display-subsystem"; + ports = <&dc_out>; + + clocks = <&syscrg 60>, + <&voutcrg 4>, + <&voutcrg 5>, + <&voutcrg 6>; + clock-names = "noc_bus", "dc_core", "axi_core", "ahb"; + resets = <&voutcrg 0>, <&voutcrg 1>, <&voutcrg 2>; + reset-names = "axi", "ahb", "core"; + }; diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml new file mode 100644 index 000000000000..2cc0ad8e65ba --- /dev/null +++ b/Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml @@ -0,0 +1,92 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,dsi-encoder.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: starfive jh7110 soc Encoder + +maintainers: + - Keith Zhao <keith.zhao@starfivetech.com> + +description: + Device-Tree bindings for simple encoder. + Simple encoder driver only has basic functionality. + the hardware of dc8200 has 2 output interface, use + syscon to select which one to be used. + +properties: + compatible: + const: starfive,dsi-encoder + + starfive,syscon: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to syscon that select crtc output. + - description: Offset of crtc selection + - description: Shift of crtc selection + description: + A phandle to syscon with two arguments that configure select output. + The argument one is the offset of crtc selection, the + argument two is the shift of crtc selection. + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + The first port should be the input coming from the associated dc channel. + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + The second port should be the output coming from the associated bridge. + + required: + - port@0 + - port@1 + +required: + - compatible + - ports + +additionalProperties: false + +examples: + - | + dssctrl: dssctrl@295b0000 { + compatible = "starfive,jh7110-vout-syscon", "syscon"; + reg = <0x295b0000 0x90>; + }; + + dsi_encoder: dsi_encoder { + compatible = "starfive,dsi-encoder"; + starfive,syscon = <&dssctrl 0x8 0x12>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + /* input */ + port@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + dsi_input0:endpoint@0 { + reg = <0>; + remote-endpoint = <&dc_out_dpi1>; + }; + }; + /* output */ + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + dsi_out:endpoint { + remote-endpoint = <&mipi_in>; + }; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml new file mode 100644 index 000000000000..0b083effec02 --- /dev/null +++ b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml @@ -0,0 +1,113 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-dc8200.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive display controller + +description: + The StarFive SoC uses the display controller based on Verisilicon IP + to transfer the image data from a video memory buffer to an external + LCD interface. + +maintainers: + - Keith Zhao <keith.zhao@starfivetech.com> + +properties: + compatible: + const: starfive,jh7110-dc8200 + + reg: + minItems: 1 + items: + - description: + host interface + - description: + display physical base address and length. + + interrupts: + items: + - description: The interrupt will be generated when DC finish one frame + + clocks: + items: + - description: Pixel clock for display channel 0. + - description: Pixel clock for display channel 1. + - description: Pixel clock from hdmi. + - description: Pixel clock for soc . + clock-names: + items: + - const: channel0 + - const: channel1 + - const: hdmi_tx + - const: dc_parent + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: + channel 0 output + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: + channel 1 output + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - ports + +additionalProperties: false + +examples: + - | + dc8200: lcd-controller@29400000 { + compatible = "starfive,jh7110-dc8200"; + reg = <0x29400000 0x100>, <0x29400800 0x2000>; + interrupts = <95>; + clocks = <&voutcrg 7>, + <&voutcrg 8>, + <&voutcrg 9>, + <&voutcrg 10>; + clock-names = "channel0", "channel1","hdmi_tx", "dc_parent"; + + crtc_out: ports { + #address-cells = <1>; + #size-cells = <0>; + + dc_out0: port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + dc_out_dpi0: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_in_dc>; + }; + + }; + + dc_out1: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + dc_out_dpi1: endpoint@1 { + reg = <1>; + remote-endpoint = <&dsi_input0>; + }; + + }; + }; + }; diff --git a/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml new file mode 100644 index 000000000000..3640d97ab789 --- /dev/null +++ b/Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml @@ -0,0 +1,82 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/starfive/starfive,jh7110-inno-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Starfive JH7110 HDMI controller + +description: + The StarFive JH7110 SoC uses the HDMI signal transmiter based on innosilicon IP + to generate HDMI signal from its input and transmit the signal to the screen. + +maintainers: + - Keith Zhao <keith.zhao@starfivetech.com> + +properties: + compatible: + const: "starfive,jh7110-inno-hdmi" + + reg: + minItems: 1 + + interrupts: + items: + - description: The HDMI hot plug detection interrupt. + + clocks: + items: + - description: System clock of HDMI module. + - description: Mclk clock of HDMI audio. + - description: Bclk clock of HDMI audio. + + clock-names: + items: + - const: sysclk + - const: mclk + - const: bclk + + resets: + maxItems: 1 + + '#sound-dai-cells': + const: 0 + + port: + $ref: /schemas/graph.yaml#/properties/port + description: + Should contain a remote endpoint phandle of display controller device. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - '#sound-dai-cells' + - port + +additionalProperties: false + +examples: + - | + hdmi: hdmi@29590000 { + compatible = "starfive,jh7110-inno-hdmi"; + reg = <0x29590000 0x4000>; + interrupts = <99>; + clocks = <&voutcrg 17>, + <&voutcrg 15>, + <&voutcrg 16>; + clock-names = "sysclk", "mclk","bclk"; + resets = <&voutcrg 9>; + #sound-dai-cells = <0>; + hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + hdmi_in_dc: endpoint@0 { + reg = <0>; + remote-endpoint = <&dc_out_hdmi>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml b/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml index 0039319e91fe..cf9b657d0e8a 100644 --- a/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml +++ b/Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml @@ -24,6 +24,7 @@ properties: - enum: - starfive,jh7110-aon-syscon - starfive,jh7110-stg-syscon + - starfive,jh7110-vout-syscon - const: syscon reg: diff --git a/MAINTAINERS b/MAINTAINERS index 7b151710e8c5..7caaadb83f3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6881,6 +6881,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/ste,mcde.yaml F: drivers/gpu/drm/mcde/ +DRM DRIVERS FOR STARFIVE +M: Keith Zhao <keith.zhao@starfivetech.com> +L: dri-devel@lists.freedesktop.org +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/starfive/ + DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE M: Jagan Teki <jagan@amarulasolutions.com> S: Maintained
StarFive SoCs JH7110 display system: dc controller, hdmi controller, encoder, vout syscon. add the path of yaml file in MAINTAINERS Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> --- .../starfive/starfive,display-subsystem.yaml | 104 ++++++++++++++++ .../starfive/starfive,dsi-encoder.yaml | 92 ++++++++++++++ .../starfive/starfive,jh7110-dc8200.yaml | 113 ++++++++++++++++++ .../starfive/starfive,jh7110-inno-hdmi.yaml | 82 +++++++++++++ .../soc/starfive/starfive,jh7110-syscon.yaml | 1 + MAINTAINERS | 7 ++ 6 files changed, 399 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,display-subsystem.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,dsi-encoder.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-dc8200.yaml create mode 100644 Documentation/devicetree/bindings/display/starfive/starfive,jh7110-inno-hdmi.yaml