[PATCH 49/49] dt: display: Add binds for the DPE and DSI controller for Kirin 960/970
Sam Ravnborg
sam at ravnborg.org
Wed Aug 19 17:02:00 EDT 2020
Hi Mauro.
Some feedback in the following.
Good to see DT schma files and not .txt files - but needs a bit more
work.
Sam
On Wed, Aug 19, 2020 at 01:46:17PM +0200, Mauro Carvalho Chehab wrote:
> Add a description of the bindings used by Kirin 960/970 Display
> Serial Interface (DSI) controller and by its Display Engine (DPE).
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei at kernel.org>
> ---
> .../display/hisilicon,hi3660-dpe.yaml | 99 +++++++++++++++++
> .../display/hisilicon,hi3660-dsi.yaml | 102 ++++++++++++++++++
> .../boot/dts/hisilicon/hikey970-drm.dtsi | 4 +-
> 3 files changed, 203 insertions(+), 2 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml
> create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml
>
> diff --git a/Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml b/Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml
> new file mode 100644
> index 000000000000..074997354417
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml
> @@ -0,0 +1,99 @@
> +# SPDX-License-Identifier: GPL-2.0
New bindings should be dual licensed if poossible.
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/display/hisilicon,hi3660-dpe.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: HiSilicon SPMI controller
> +
> +maintainers:
> + - Mauro Carvalho Chehab <mchehab+huawei at kernel.org>
> +
> +description: |
> + The HiSilicon Display Engine (DPE) s the display controller which grab
s/s/is/
> + image data from memory, do composition, do post image processing,
> + generate RGB timing stream and transfer to DSI.
> +
> +properties:
> + $nodename:
> + pattern: "dpe@[0-9a-f]+"
compatible will match, no need for the nodename.
> +
> + compatible:
> + enum:
> + - hisilicon,kirin960-dpe
> + - hisilicon,kirin970-dpe
> +
> + reg:
> + minItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + clocks:
> + minItems: 1
> + description: Clocks used by the ISP and by the display
All clocks must be described.
> +
> + clock-names:
> + description: Names for the clock lines
Specify clock names here.
> +
> + dma-coherent: true
> +
> + port:
> + type: object
> + description: A port node pointing to the display output endpoint.
> +
> +
> + iommu-info:
> + type: object
> + description: IOMMU address and size to be used by GPU
> +
> + properties:
> + start-addr:
> + const: start address for IOMMU
> + size:
> + const: size of the mapped region
additionalProperties: false?
- So a DT do not use undocumented properties.
required:?
- So a DT always includes the mandatory properties
> +
> +examples:
> + - |
> + dpe: dpe at e8600000 {
> + compatible = "hisilicon,kirin970-dpe";
> + memory-region = <&drm_dma_reserved>;
memory-region not included in the binding.
> + reg = <0 0xE8600000 0 0xC0000>,
> + <0 0xFFF35000 0 0x1000>,
> + <0 0xFFF0A000 0 0x1000>,
> + <0 0xE8A09000 0 0x1000>,
> + <0 0xE86C0000 0 0x10000>,
> + <0 0xFFF31000 0 0x1000>,
> + <0 0xE87FF000 0 0x1000>;
> +
> + interrupts = <0 245 4>;
> +
> + clocks = <&media1_crg HI3670_ACLK_GATE_DSS>,
> + <&media1_crg HI3670_PCLK_GATE_DSS>,
> + <&media1_crg HI3670_CLK_GATE_EDC0>,
> + <&media1_crg HI3670_CLK_GATE_LDI0>,
> + <&media1_crg HI3670_CLK_GATE_DSS_AXI_MM>,
> + <&media1_crg HI3670_PCLK_GATE_MMBUF>,
> + <&crg_ctrl HI3670_PCLK_GATE_PCTRL>;
The validation will fail as HI3670_PCLK_GATE_PCTRL is unknown.
Include the relevant header.
Use make dt_binding_check to validate the binding files.
> +
> + clock-names = "aclk_dss",
> + "pclk_dss",
> + "clk_edc0",
> + "clk_ldi0",
> + "clk_dss_axi_mm",
> + "pclk_mmbuf",
> + "pclk_pctrl";
> +
> + dma-coherent;
> +
> + port {
> + dpe_out: endpoint {
> + remote-endpoint = <&dsi_in>;
> + };
> + };
> +
> + iommu_info {
> + start-addr = <0x8000>;
> + size = <0xbfff8000>;
> + };
> + };
End file with:
<empty line>
...
> diff --git a/Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml b/Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml
> new file mode 100644
> index 000000000000..2265267fc53d
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml
> @@ -0,0 +1,102 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/display/hisilicon,hi3660-dsi.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: HiSilicon SPMI controller
> +
> +maintainers:
> + - Mauro Carvalho Chehab <mchehab+huawei at kernel.org>
> +
> +description: |
> + The HiSilicon Display Serial Interface (DSI) Host Controller for
> + Kirin 960 and 970 resides in the middle of display controller and
> + an external HDMI converter or panel.
> +
> +properties:
> + $nodename:
> + pattern: "dsi@[0-9a-f]+"
Same comment as before.
> +
> + compatible:
> + enum:
> + - hisilicon,kirin960-dsi
> + - hisilicon,kirin970-dsi
> +
> + reg:
> + minItems: 1
> + maxItems: 4
> +
> + clocks:
> + minItems: 1
> + maxItems: 8
> + description: Clocks used by the ISP and by the display.
> +
> + clock-names:
> + description: Names for the clock lines.
Add the names.
> +
> + "#address-cells":
> + const: 1
> +
> + "#size-cells":
> + const: 0
> +
> + mux-gpio:
> + description: GPIO used by the mux.
Must be named mux-gpios - added 's' even with a single gpio.
> +
> + ports:
> + type: object
> + description: Display input and output ports.
> +
> +examples:
> + - |
> + dsi: dsi at e8601000 {
> + compatible = "hisilicon,kirin970-dsi";
> + reg = <0 0xE8601000 0 0x7F000>,
> + <0 0xFFF35000 0 0x1000>,
> + <0 0xE8A09000 0 0x1000>;
> +
> + clocks = <&crg_ctrl HI3670_CLK_GATE_TXDPHY0_REF>,
> + <&crg_ctrl HI3670_CLK_GATE_TXDPHY1_REF>,
> + <&crg_ctrl HI3670_CLK_GATE_TXDPHY0_CFG>,
> + <&crg_ctrl HI3670_CLK_GATE_TXDPHY1_CFG>,
> + <&crg_ctrl HI3670_PCLK_GATE_DSI0>,
> + <&crg_ctrl HI3670_PCLK_GATE_DSI1>;
> + clock-names = "clk_txdphy0_ref",
> + "clk_txdphy1_ref",
> + "clk_txdphy0_cfg",
> + "clk_txdphy1_cfg",
> + "pclk_dsi0",
> + "pclk_dsi1";
> +
> + #address-cells = <1>;
> + #size-cells = <0>;
> + mux-gpio = <&gpio25 7 0>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + port at 0 {
> + reg = <0>;
> + dsi_in: endpoint {
> + remote-endpoint = <&dpe_out>;
> + };
> + };
> +
> + port at 1 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <1>;
> +
> + dsi_out0: endpoint at 0 {
> + reg = <0>;
> + remote-endpoint = <&adv7533_in>;
> + };
> +
> + dsi_out1: endpoint at 1 {
> + reg = <1>;
> + remote-endpoint = <&panel0_in>;
> + };
> + };
> + };
> diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi
> index 503c7c9425c8..5758d7d181e5 100644
> --- a/arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0
> / {
> - dpe: dpe at E8600000 {
> + dpe: dpe at e8600000 {
> compatible = "hisilicon,kirin970-dpe";
> memory-region = <&drm_dma_reserved>;
> // DSS, PERI_CRG, SCTRL, PCTRL, NOC_DSS_Service_Target, PMCTRL, MEDIA_CRG
> @@ -44,7 +44,7 @@ iommu_info {
> };
> };
>
> - dsi: dsi at E8601000 {
> + dsi: dsi at e8601000 {
> compatible = "hisilicon,kirin970-dsi";
> reg = <0 0xE8601000 0 0x7F000>,
> <0 0xFFF35000 0 0x1000>,
> --
> 2.26.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the linux-arm-kernel
mailing list