Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp474349ybb; Wed, 25 Mar 2020 03:39:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vucWKQgJYZAff1Ei7AhW98+Bw9o8KxmiXIFkaIyFHuVvQYbCwhbih0kfOjN1UpSEmGLw8u7 X-Received: by 2002:a54:4614:: with SMTP id p20mr1900582oip.48.1585132755450; Wed, 25 Mar 2020 03:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585132755; cv=none; d=google.com; s=arc-20160816; b=hbrTB9xNhbTSPRlJ13nG2xw+cAipELD2e7Q5bZsVUZ+bSF9OKycb2Wg639cyrvtqDe ofD+m0LkKA8CB0IWHgc4lQNdPKb2q6cxqi12H9W7gp6Fp695Csu1swKDroMCK9Fvsrzv Qx4GxFPr8DgeRjU6ux2AcXegeI5uaVYRp4HGJE0/0pw+wffRAuwybXkjkt2SCnfq71KT bT5rd9qsQ80zPGz3MWeutnaQr/lyan9dSE0dZ6wnFifxAKwN0MIxLajPC6kEjqqA0XS1 2fxsnqdParu0MRbE2JB62mZSJ/M/dibSITfgR1FfVMCYoG5/eHTq4LRI4sJJwcnpTwRQ Y1dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=EzOA88IPnqtfpe/48GPuflQNR0kYjwA+VSvKhhJrxps=; b=YVDf4CtldQDtKORHVxBTHoOsaM/g1kEbWlpEd3FOwGewxbLJDspUGF12Y3I8qjntfG Nb0vAGRyVWhQpVTob6NVozRC0EWzhXRkIT99wP1TuU6EaScbFNyn3HzEVHvm9ZWhFWtj 4hIy21IBoN9mHjj6Ai60vMtetH23eP2X/VwqdbV+LqeA+XopXBX0R5p0eS5CUNN11uNF WzosiFtYgMNCdGiDiK2o5gG7G2XcsNi3TZXV575U0QlkV30dZPb59iKy/XvfkZK+s7Ml zV8Pc3SrdHJHuSt/A5tWxjRJ5x9B0xLHTDaUBPeGKxPzhR4eX2z58JD1ORn+UnwEZc1M 4VsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RsGdMY8I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 94si10191779otb.114.2020.03.25.03.39.02; Wed, 25 Mar 2020 03:39:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RsGdMY8I; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727666AbgCYKij (ORCPT + 99 others); Wed, 25 Mar 2020 06:38:39 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36706 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbgCYKij (ORCPT ); Wed, 25 Mar 2020 06:38:39 -0400 Received: by mail-wm1-f68.google.com with SMTP id g62so1978784wme.1; Wed, 25 Mar 2020 03:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EzOA88IPnqtfpe/48GPuflQNR0kYjwA+VSvKhhJrxps=; b=RsGdMY8IvlSnAyG0MzIkhchfOXRHnz2dyXPRTkAmdwR5Sa9twAHcAGWe9qyGKH7sFo mxxkmrp3kY9sgPF9DXmJNhevLM4IHDd3xR7Drk0z6tK17xIIwmWpONvnx6msWUP/YJkH wiRxrnH/pQG8F4aUsOiA/SlkA72KVr9g/YULwRFtQQVECRj71W8OVYA1WHURheRC1svq +9YHK6ESY5j8KbqcOZ9fHdSwZ/1han8PUzEYbVwGNk8MATWwv+wrjd17c5jM56zOSw9h PMu/51uwxJ425YHNf9Iy5g7FwAuIVBDpXRz7uE5ZMg2comkxccRQzi3cQ92sZffi8rpP Jfrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EzOA88IPnqtfpe/48GPuflQNR0kYjwA+VSvKhhJrxps=; b=dYpEBaYt8e9nc494OTGnxN681FIOidp2z/p8fQozw0Ua+qhuKoGrsnsTTenpRfTg7F z4KHThh5GZabVdzuLyZ9sBMsF0QB3vWZ46pU7XXfxfkcxfZ3pcIdMcGkJcGztb2ZQSJJ YjqdFTAWXv/TSTG5o3zjGbFC814abBBtJ1ZGsyGAUuuxvS4pxrotYceU12W6zlB4OIPV u51TIyYjGuPy1VJGwy1cw4Ui8czyhOxxIw4M8+IKbfKk1x5uCtyDWct7Nk2wGCnMvSzP ZkjRa1GKVYkWz6JCuB0WRU/+EiTOdOVKR8DZI9FC+uJqPObbgNaIoIRa+TU2mDdEwc1V /uYw== X-Gm-Message-State: ANhLgQ3Llwlery1A7kI3SUEcGiuCaUQKXRG0JkIlhVDPk2M6hbYoH4fC Y/Wyux/fM9bufL0JLRwukSM= X-Received: by 2002:a1c:2e04:: with SMTP id u4mr2936248wmu.185.1585132715841; Wed, 25 Mar 2020 03:38:35 -0700 (PDT) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id i21sm9163108wmb.23.2020.03.25.03.38.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 03:38:35 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Cc: hjc@rock-chips.com, airlied@linux.ie, daniel@ffwll.ch, robh+dt@kernel.org, dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/2] dt-bindings: display: convert rockchip vop bindings to yaml Date: Wed, 25 Mar 2020 11:38:27 +0100 Message-Id: <20200325103828.5422-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current dts files with 'vop' nodes are manually verified. In order to automate this process rockchip-vop.txt has to be converted to yaml. Signed-off-by: Johan Jonker --- Changes v4: Change description Replace compatible oneOf by enum Change interrupts description Remove resets minItems Changes v3: Change description Changes v2: No new properties --- .../bindings/display/rockchip/rockchip-vop.txt | 74 ------------ .../bindings/display/rockchip/rockchip-vop.yaml | 124 +++++++++++++++++++++ 2 files changed, 124 insertions(+), 74 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt deleted file mode 100644 index 8b3a5f514..000000000 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt +++ /dev/null @@ -1,74 +0,0 @@ -device-tree bindings for rockchip soc display controller (vop) - -VOP (Visual Output Processor) is the Display Controller for the Rockchip -series of SoCs which transfers the image data from a video memory -buffer to an external LCD interface. - -Required properties: -- compatible: value should be one of the following - "rockchip,rk3036-vop"; - "rockchip,rk3126-vop"; - "rockchip,px30-vop-lit"; - "rockchip,px30-vop-big"; - "rockchip,rk3066-vop"; - "rockchip,rk3188-vop"; - "rockchip,rk3288-vop"; - "rockchip,rk3368-vop"; - "rockchip,rk3366-vop"; - "rockchip,rk3399-vop-big"; - "rockchip,rk3399-vop-lit"; - "rockchip,rk3228-vop"; - "rockchip,rk3328-vop"; - -- reg: Must contain one entry corresponding to the base address and length - of the register space. Can optionally contain a second entry - corresponding to the CRTC gamma LUT address. - -- interrupts: should contain a list of all VOP IP block interrupts in the - order: VSYNC, LCD_SYSTEM. The interrupt specifier - format depends on the interrupt controller used. - -- clocks: must include clock specifiers corresponding to entries in the - clock-names property. - -- clock-names: Must contain - aclk_vop: for ddr buffer transfer. - hclk_vop: for ahb bus to R/W the phy regs. - dclk_vop: pixel clock. - -- resets: Must contain an entry for each entry in reset-names. - See ../reset/reset.txt for details. -- reset-names: Must include the following entries: - - axi - - ahb - - dclk - -- iommus: required a iommu node - -- port: A port node with endpoint definitions as defined in - Documentation/devicetree/bindings/media/video-interfaces.txt. - -Example: -SoC specific DT entry: - vopb: vopb@ff930000 { - compatible = "rockchip,rk3288-vop"; - reg = <0x0 0xff930000 0x0 0x19c>, <0x0 0xff931000 0x0 0x1000>; - interrupts = ; - clocks = <&cru ACLK_VOP0>, <&cru DCLK_VOP0>, <&cru HCLK_VOP0>; - clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; - resets = <&cru SRST_LCDC1_AXI>, <&cru SRST_LCDC1_AHB>, <&cru SRST_LCDC1_DCLK>; - reset-names = "axi", "ahb", "dclk"; - iommus = <&vopb_mmu>; - vopb_out: port { - #address-cells = <1>; - #size-cells = <0>; - vopb_out_edp: endpoint@0 { - reg = <0>; - remote-endpoint=<&edp_in_vopb>; - }; - vopb_out_hdmi: endpoint@1 { - reg = <1>; - remote-endpoint=<&hdmi_in_vopb>; - }; - }; - }; diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml new file mode 100644 index 000000000..bc58c5132 --- /dev/null +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.yaml @@ -0,0 +1,124 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/rockchip/rockchip-vop.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Rockchip SoC display controller (VOP) + +description: + VOP (Video Output Processor) is the display controller for the Rockchip + series of SoCs which transfers the image data from a video memory + buffer to an external LCD interface. + +maintainers: + - Sandy Huang + - Heiko Stuebner + +properties: + compatible: + enum: + - rockchip,px30-vop-big + - rockchip,px30-vop-lit + - rockchip,rk3036-vop + - rockchip,rk3066-vop + - rockchip,rk3126-vop + - rockchip,rk3188-vop + - rockchip,rk3228-vop + - rockchip,rk3288-vop + - rockchip,rk3328-vop + - rockchip,rk3366-vop + - rockchip,rk3368-vop + - rockchip,rk3399-vop-big + - rockchip,rk3399-vop-lit + + reg: + minItems: 1 + items: + - description: + Must contain one entry corresponding to the base address and length + of the register space. + - description: + Can optionally contain a second entry corresponding to + the CRTC gamma LUT address. + + interrupts: + maxItems: 1 + description: + The VOP interrupt is shared by several interrupt sources, such as + frame start (VSYNC), line flag and other status interrupts. + + clocks: + items: + - description: Clock for ddr buffer transfer. + - description: Pixel clock. + - description: Clock for the ahb bus to R/W the phy regs. + + clock-names: + items: + - const: aclk_vop + - const: dclk_vop + - const: hclk_vop + + resets: + maxItems: 3 + + reset-names: + items: + - const: axi + - const: ahb + - const: dclk + + port: + type: object + description: + A port node with endpoint definitions as defined in + Documentation/devicetree/bindings/media/video-interfaces.txt. + + iommus: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + - reset-names + - port + +additionalProperties: false + +examples: + - | + #include + #include + #include + vopb: vopb@ff930000 { + compatible = "rockchip,rk3288-vop"; + reg = <0x0 0xff930000 0x0 0x19c>, + <0x0 0xff931000 0x0 0x1000>; + interrupts = ; + clocks = <&cru ACLK_VOP0>, + <&cru DCLK_VOP0>, + <&cru HCLK_VOP0>; + clock-names = "aclk_vop", "dclk_vop", "hclk_vop"; + resets = <&cru SRST_LCDC1_AXI>, + <&cru SRST_LCDC1_AHB>, + <&cru SRST_LCDC1_DCLK>; + reset-names = "axi", "ahb", "dclk"; + iommus = <&vopb_mmu>; + vopb_out: port { + #address-cells = <1>; + #size-cells = <0>; + vopb_out_edp: endpoint@0 { + reg = <0>; + remote-endpoint=<&edp_in_vopb>; + }; + vopb_out_hdmi: endpoint@1 { + reg = <1>; + remote-endpoint=<&hdmi_in_vopb>; + }; + }; + }; -- 2.11.0