| Message ID | 20230602074043.33872-2-keith.zhao@starfivetech.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add DRM driver for StarFive SoC JH7110 | expand |
Hey Keith, On Fri, Jun 02, 2023 at 03:40:35PM +0800, Keith Zhao wrote: > Add bindings for JH7110 display subsystem which > has a display controller verisilicon dc8200 > and an HDMI interface. > > Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> > --- > .../display/verisilicon/starfive-hdmi.yaml | 93 +++++++++++++++ > .../display/verisilicon/verisilicon-dc.yaml | 110 ++++++++++++++++++ > .../display/verisilicon/verisilicon-drm.yaml | 42 +++++++ > .../devicetree/bindings/vendor-prefixes.yaml | 2 + > MAINTAINERS | 7 ++ > 5 files changed, 254 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml > create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml > create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml > > diff --git a/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml > new file mode 100644 > index 000000000000..c30b7954a355 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml > @@ -0,0 +1,93 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/verisilicon/starfive-hdmi.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: StarFive HDMI transmiter > + > +description: > + The StarFive SoC uses the HDMI signal transmiter based on innosilicon IP Is innosilicon the same thing as verisilicon? Also s/transmiter/transmitter/, both here and in the title. > + to generate HDMI signal from its input and transmit the signal to the screen. > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + - ShengYang Chen <shengyang.chen@starfivetech.com> > + > +properties: > + compatible: > + const: starfive,hdmi Is this going to work on every SoC that StarFive has ever & will ever make? Please use soc-based compatibles ;) > + > + 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. > + - description: Pixel clock generated by HDMI module. > + > + clock-names: > + items: > + - const: sysclk > + - const: mclk > + - const: bclk > + - const: pclk > + > + resets: > + items: > + - description: Reset for HDMI module. > + > + reset-names: > + items: > + - const: hdmi_tx You only have one item here, you don't need the "items: - const:", "const:" alone will do. > diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml > new file mode 100644 > index 000000000000..1322502c4cde > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml > @@ -0,0 +1,110 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-dc.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. Is it based on Verisilicon IP, or is it exactly that verisilicon IP? I ask because... > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + - ShengYang Chen <shengyang.chen@starfivetech.com> > + > +properties: > + compatible: > + const: verisilicon,dc8200 ...the compatible is the verisilicon IP. I would be a lot happier if the compatibles were set yp for something like: "starfive,jh7110-foo", "verisilicon,dc8200" > diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml > new file mode 100644 > index 000000000000..aed8d4af2c55 > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml > @@ -0,0 +1,42 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-drm.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Verisilicon DRM master device > + > +maintainers: > + - Keith Zhao <keith.zhao@starfivetech.com> > + - ShengYang Chen <shengyang.chen@starfivetech.com> > + > +description: | > + The Verisilicon DRM master device is a virtual device needed to list all > + display controller or other display interface nodes that comprise the > + graphics subsystem. > + > +properties: > + compatible: > + const: verisilicon,display-subsystem Same here. > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml > index 82d39ab0231b..52c04fd098be 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml > @@ -1436,6 +1436,8 @@ patternProperties: > description: Variscite Ltd. > "^vdl,.*": > description: Van der Laan b.v. > + "^verisilicon,.*": > + description: Verisilicon Technologies, Inc. This should be in it's own patch. Cheers, Conor. > "^vertexcom,.*": > description: Vertexcom Technologies, Inc. > "^via,.*": > diff --git a/MAINTAINERS b/MAINTAINERS > index 2a0496448b7f..293aa13d484c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -7049,6 +7049,13 @@ F: Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml > F: drivers/gpu/drm/vc4/ > F: include/uapi/drm/vc4_drm.h > > +DRM DRIVERS FOR VERISILICON > +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/verisilicon/ > + > DRM DRIVERS FOR VIVANTE GPU IP > M: Lucas Stach <l.stach@pengutronix.de> > R: Russell King <linux+etnaviv@armlinux.org.uk> > -- > 2.34.1 >
Hi Conor, > Hey Keith, > > On Fri, Jun 02, 2023 at 03:40:35PM +0800, Keith Zhao wrote: >> Add bindings for JH7110 display subsystem which >> has a display controller verisilicon dc8200 >> and an HDMI interface. >> >> Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> >> --- >> .../display/verisilicon/starfive-hdmi.yaml | 93 +++++++++++++++ >> .../display/verisilicon/verisilicon-dc.yaml | 110 ++++++++++++++++++ >> .../display/verisilicon/verisilicon-drm.yaml | 42 +++++++ >> .../devicetree/bindings/vendor-prefixes.yaml | 2 + >> MAINTAINERS | 7 ++ >> 5 files changed, 254 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml >> create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml >> create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml >> >> diff --git a/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml >> new file mode 100644 >> index 000000000000..c30b7954a355 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml >> @@ -0,0 +1,93 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/display/verisilicon/starfive-hdmi.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: StarFive HDMI transmiter >> + >> +description: >> + The StarFive SoC uses the HDMI signal transmiter based on innosilicon IP > Is innosilicon the same thing as verisilicon? Also > s/transmiter/transmitter/, both here and in the title. I think that is not the same, I remember Rockchip has used a HDMI transmitter from Innosilicon, and there is a existing driver for that in mainline. So Keith, if that's true, I think it is better to seperate the HDMI stuff and reuse existing driver. Best regards, Shengyu > >> + to generate HDMI signal from its input and transmit the signal to the screen. >> + >> +maintainers: >> + - Keith Zhao <keith.zhao@starfivetech.com> >> + - ShengYang Chen <shengyang.chen@starfivetech.com> >> + >> +properties: >> + compatible: >> + const: starfive,hdmi > Is this going to work on every SoC that StarFive has ever & will ever > make? Please use soc-based compatibles ;) > >> + >> + 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. >> + - description: Pixel clock generated by HDMI module. >> + >> + clock-names: >> + items: >> + - const: sysclk >> + - const: mclk >> + - const: bclk >> + - const: pclk >> + >> + resets: >> + items: >> + - description: Reset for HDMI module. >> + >> + reset-names: >> + items: >> + - const: hdmi_tx > You only have one item here, you don't need the "items: - const:", > "const:" alone will do. > > >> diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml >> new file mode 100644 >> index 000000000000..1322502c4cde >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml >> @@ -0,0 +1,110 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-dc.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. > Is it based on Verisilicon IP, or is it exactly that verisilicon IP? I > ask because... > >> +maintainers: >> + - Keith Zhao <keith.zhao@starfivetech.com> >> + - ShengYang Chen <shengyang.chen@starfivetech.com> >> + >> +properties: >> + compatible: >> + const: verisilicon,dc8200 > ...the compatible is the verisilicon IP. I would be a lot happier if > the compatibles were set yp for something like: > "starfive,jh7110-foo", "verisilicon,dc8200" > >> diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml >> new file mode 100644 >> index 000000000000..aed8d4af2c55 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml >> @@ -0,0 +1,42 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-drm.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Verisilicon DRM master device >> + >> +maintainers: >> + - Keith Zhao <keith.zhao@starfivetech.com> >> + - ShengYang Chen <shengyang.chen@starfivetech.com> >> + >> +description: | >> + The Verisilicon DRM master device is a virtual device needed to list all >> + display controller or other display interface nodes that comprise the >> + graphics subsystem. >> + >> +properties: >> + compatible: >> + const: verisilicon,display-subsystem > Same here. > >> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml >> index 82d39ab0231b..52c04fd098be 100644 >> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml >> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml >> @@ -1436,6 +1436,8 @@ patternProperties: >> description: Variscite Ltd. >> "^vdl,.*": >> description: Van der Laan b.v. >> + "^verisilicon,.*": >> + description: Verisilicon Technologies, Inc. > This should be in it's own patch. > > Cheers, > Conor. > >> "^vertexcom,.*": >> description: Vertexcom Technologies, Inc. >> "^via,.*": >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 2a0496448b7f..293aa13d484c 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -7049,6 +7049,13 @@ F: Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml >> F: drivers/gpu/drm/vc4/ >> F: include/uapi/drm/vc4_drm.h >> >> +DRM DRIVERS FOR VERISILICON >> +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/verisilicon/ >> + >> DRM DRIVERS FOR VIVANTE GPU IP >> M: Lucas Stach <l.stach@pengutronix.de> >> R: Russell King <linux+etnaviv@armlinux.org.uk> >> -- >> 2.34.1 >>
diff --git a/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml new file mode 100644 index 000000000000..c30b7954a355 --- /dev/null +++ b/Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml @@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/verisilicon/starfive-hdmi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: StarFive HDMI transmiter + +description: + The StarFive 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> + - ShengYang Chen <shengyang.chen@starfivetech.com> + +properties: + compatible: + const: starfive,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. + - description: Pixel clock generated by HDMI module. + + clock-names: + items: + - const: sysclk + - const: mclk + - const: bclk + - const: pclk + + resets: + items: + - description: Reset for HDMI module. + + reset-names: + items: + - const: hdmi_tx + + '#sound-dai-cells': + const: 0 + + port: + $ref: /schemas/graph.yaml#/properties/port + description: + Port node with one endpoint connected to a display connector node. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + - '#sound-dai-cells' + - port + +additionalProperties: false + +examples: + - | + hdmi: hdmi@29590000 { + compatible = "starfive,hdmi"; + reg = <0x29590000 0x4000>; + interrupts = <99>; + clocks = <&voutcrg 17>, + <&voutcrg 15>, + <&voutcrg 16>, + <&hdmitx0_pixelclk>; + clock-names = "sysclk", "mclk","bclk","pclk"; + resets = <&voutcrg 9>; + reset-names = "hdmi_tx"; + #sound-dai-cells = <0>; + hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + hdmi_input: endpoint@0 { + reg = <0>; + remote-endpoint = <&dc_out_dpi0>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml new file mode 100644 index 000000000000..1322502c4cde --- /dev/null +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml @@ -0,0 +1,110 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-dc.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> + - ShengYang Chen <shengyang.chen@starfivetech.com> + +properties: + compatible: + const: verisilicon,dc8200 + + reg: + maxItems: 3 + + interrupts: + items: + - description: The interrupt will be generated when DC finish one frame + + clocks: + items: + - description: Clock for display system noc bus. + - description: Pixel clock for display channel 0. + - description: Pixel clock for display channel 1. + - description: Clock for axi interface of display controller. + - description: Core clock for display controller. + - description: Clock for ahb interface of display controller. + - description: External HDMI pixel clock. + - description: Parent clock for pixel clock + + clock-names: + items: + - const: clk_vout_noc_disp + - const: clk_vout_pix0 + - const: clk_vout_pix1 + - const: clk_vout_axi + - const: clk_vout_core + - const: clk_vout_vout_ahb + - const: hdmitx0_pixel + - const: clk_vout_dc8200 + + resets: + items: + - description: Reset for axi interface of display controller. + - description: Reset for ahb interface of display controller. + - description: Core reset of display controller. + + reset-names: + items: + - const: rst_vout_axi + - const: rst_vout_ahb + - const: rst_vout_core + + port: + $ref: /schemas/graph.yaml#/properties/port + description: + Port node with one endpoint connected to a hdmi node. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + - port + +additionalProperties: false + +examples: + - | + dc8200: dc8200@29400000 { + compatible = "verisilicon,dc8200"; + reg = <0x29400000 0x100>, + <0x29400800 0x2000>, + <0x295B0000 0x90>; + interrupts = <95>; + clocks = <&syscrg 60>, + <&voutcrg 7>, + <&voutcrg 8>, + <&voutcrg 4>, + <&voutcrg 5>, + <&voutcrg 6>, + <&hdmitx0_pixelclk>, + <&voutcrg 1>; + clock-names = "clk_vout_noc_disp", "clk_vout_pix0", "clk_vout_pix1", "clk_vout_axi", + "clk_vout_core", "clk_vout_vout_ahb", "hdmitx0_pixel","clk_vout_dc8200"; + resets = <&voutcrg 0>, + <&voutcrg 1>, + <&voutcrg 2>; + reset-names = "rst_vout_axi","rst_vout_ahb","rst_vout_core"; + dc_out: port { + #address-cells = <1>; + #size-cells = <0>; + dc_out_dpi0: endpoint@0 { + reg = <0>; + remote-endpoint = <&hdmi_input>; + }; + }; + }; diff --git a/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml new file mode 100644 index 000000000000..aed8d4af2c55 --- /dev/null +++ b/Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/verisilicon/verisilicon-drm.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Verisilicon DRM master device + +maintainers: + - Keith Zhao <keith.zhao@starfivetech.com> + - ShengYang Chen <shengyang.chen@starfivetech.com> + +description: | + The Verisilicon DRM master device is a virtual device needed to list all + display controller or other display interface nodes that comprise the + graphics subsystem. + +properties: + compatible: + const: verisilicon,display-subsystem + + ports: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + maxItems: 1 + description: | + Should contain a list of phandles pointing to display interface ports + of display controller devices. Display controller definitions as defined in + Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml + +required: + - compatible + - ports + +additionalProperties: false + +examples: + - | + display-subsystem { + compatible = "verisilicon,display-subsystem"; + ports = <&dc_out>; + }; diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 82d39ab0231b..52c04fd098be 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -1436,6 +1436,8 @@ patternProperties: description: Variscite Ltd. "^vdl,.*": description: Van der Laan b.v. + "^verisilicon,.*": + description: Verisilicon Technologies, Inc. "^vertexcom,.*": description: Vertexcom Technologies, Inc. "^via,.*": diff --git a/MAINTAINERS b/MAINTAINERS index 2a0496448b7f..293aa13d484c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7049,6 +7049,13 @@ F: Documentation/devicetree/bindings/display/brcm,bcm2835-*.yaml F: drivers/gpu/drm/vc4/ F: include/uapi/drm/vc4_drm.h +DRM DRIVERS FOR VERISILICON +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/verisilicon/ + DRM DRIVERS FOR VIVANTE GPU IP M: Lucas Stach <l.stach@pengutronix.de> R: Russell King <linux+etnaviv@armlinux.org.uk>
Add bindings for JH7110 display subsystem which has a display controller verisilicon dc8200 and an HDMI interface. Signed-off-by: Keith Zhao <keith.zhao@starfivetech.com> --- .../display/verisilicon/starfive-hdmi.yaml | 93 +++++++++++++++ .../display/verisilicon/verisilicon-dc.yaml | 110 ++++++++++++++++++ .../display/verisilicon/verisilicon-drm.yaml | 42 +++++++ .../devicetree/bindings/vendor-prefixes.yaml | 2 + MAINTAINERS | 7 ++ 5 files changed, 254 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/verisilicon/starfive-hdmi.yaml create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-dc.yaml create mode 100644 Documentation/devicetree/bindings/display/verisilicon/verisilicon-drm.yaml