From patchwork Sun Jun 21 00:47:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 198749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60039C433E5 for ; Sun, 21 Jun 2020 00:48:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B0F824772 for ; Sun, 21 Jun 2020 00:48:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vDuSJS5u" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728894AbgFUAsG (ORCPT ); Sat, 20 Jun 2020 20:48:06 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:60972 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728901AbgFUAsF (ORCPT ); Sat, 20 Jun 2020 20:48:05 -0400 Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 198B8592; Sun, 21 Jun 2020 02:48:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592700483; bh=tbl8Cg+MVyQ6V5JcIkVIXWcGnYTPq4SLi8EuIAle/OU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vDuSJS5uV53psKVpOkUY6CKp7QCK5CXBOTrEEYJ+cF88yb4iQP1aORWwnZE5aHBV7 ro7ntR8OoHZUhV8p+FAnpscJBT4kUqFJxS/juF4AzPax3MCz+qHKsRbhocZKUt1J9u KNt6j5PyyE+mEuip7JzyQ15sFUhiAoUXxdktA4kQ= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring Subject: [PATCH v2 2/8] dt-bindings: media: renesas, fcp: Make power-domains mandatory Date: Sun, 21 Jun 2020 03:47:28 +0300 Message-Id: <20200621004734.28602-3-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> References: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org All DT source files in the kernel tree specify the power-domains property. Make it mandatory. Signed-off-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Acked-by: Rob Herring --- Changes since v1: - Fix typo in commit message --- Documentation/devicetree/bindings/media/renesas,fcp.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/media/renesas,fcp.yaml b/Documentation/devicetree/bindings/media/renesas,fcp.yaml index 9241bf3c5efc..eeca7e255420 100644 --- a/Documentation/devicetree/bindings/media/renesas,fcp.yaml +++ b/Documentation/devicetree/bindings/media/renesas,fcp.yaml @@ -38,6 +38,7 @@ required: - compatible - reg - clocks + - power-domains additionalProperties: false From patchwork Sun Jun 21 00:47:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 198748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 223B8C433E7 for ; Sun, 21 Jun 2020 00:48:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5D7824768 for ; Sun, 21 Jun 2020 00:48:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="VQfojGw1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729081AbgFUAsI (ORCPT ); Sat, 20 Jun 2020 20:48:08 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:60982 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729071AbgFUAsH (ORCPT ); Sat, 20 Jun 2020 20:48:07 -0400 Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 909CE594; Sun, 21 Jun 2020 02:48:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592700483; bh=YMtD6wOIip3YKV0hcQV51wfPJsDU/xc/A1PPGNL2Eaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQfojGw1++imUeWLxcqx0bQj7dW/CviLjAKiWfQhxUSVm/FoJBgKi3Ucg2FGyM2Go kqIsJVvzIp22p5WQp/XuIgxcJ4h7OpklchZRtDI+D7O5r7AnWXct/aKEK1WOp4v1qL SNtTEoIySoGVwCo/Mkawz17DuPtoqx8Gz4bMxNpU= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring Subject: [PATCH v2 3/8] dt-bindings: media: renesas, fcp: Add resets and iommus properties Date: Sun, 21 Jun 2020 03:47:29 +0300 Message-Id: <20200621004734.28602-4-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> References: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The resets and iommus properties are used in DT sources in the kernel tree. Document them, and make resets mandatory. The iommus property is optional as not all platforms wire the FCP to a functional IOMMU. Signed-off-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven --- Documentation/devicetree/bindings/media/renesas,fcp.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/media/renesas,fcp.yaml b/Documentation/devicetree/bindings/media/renesas,fcp.yaml index eeca7e255420..b6cf2958e6c9 100644 --- a/Documentation/devicetree/bindings/media/renesas,fcp.yaml +++ b/Documentation/devicetree/bindings/media/renesas,fcp.yaml @@ -31,14 +31,21 @@ properties: clocks: maxItems: 1 + iommus: + maxItems: 1 + power-domains: maxItems: 1 + resets: + maxItems: 1 + required: - compatible - reg - clocks - power-domains + - resets additionalProperties: false @@ -53,5 +60,7 @@ examples: reg = <0xfea2f000 0x200>; clocks = <&cpg CPG_MOD 602>; power-domains = <&sysc R8A7795_PD_ALWAYS_ON>; + resets = <&cpg 602>; + iommus = <&ipmmu_vi0 9>; }; ... From patchwork Sun Jun 21 00:47:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 198747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69A1BC433E8 for ; Sun, 21 Jun 2020 00:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 430DD24772 for ; Sun, 21 Jun 2020 00:48:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hTC86cOC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729123AbgFUAsO (ORCPT ); Sat, 20 Jun 2020 20:48:14 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:60982 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729095AbgFUAsN (ORCPT ); Sat, 20 Jun 2020 20:48:13 -0400 Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AB83D121D; Sun, 21 Jun 2020 02:48:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592700486; bh=r4slO3J2OVAdpD9Rtd5cjCvrs/gu1OQ+MmNPXj4fgi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTC86cOCyBpoUiyYVwKuaqYF+XCFCZNgZdItHzwKVM6c19MW3UQSLOqbro35M1f6Z Ap0GFDNY/Y7H6ewb5uowwoXYV+fxakO3b9jEl224YonviCwPwXH4x0QCP5JgN/w7/F WlpsrJx2S2MibZktJg5aP9NrsPwW+I1zELMEqWOg= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring Subject: [PATCH v2 7/8] dt-bindings: media: renesas, vsp1: Convert binding to YAML Date: Sun, 21 Jun 2020 03:47:33 +0300 Message-Id: <20200621004734.28602-8-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> References: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert the Renesas R-Car VSP1 text binding to YAML. Signed-off-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven --- Changes since v1: - Simplify comments on compatible strings - Update MAINTAINERS --- .../bindings/media/renesas,vsp1.txt | 30 ------- .../bindings/media/renesas,vsp1.yaml | 83 +++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 84 insertions(+), 31 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.txt create mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.yaml diff --git a/Documentation/devicetree/bindings/media/renesas,vsp1.txt b/Documentation/devicetree/bindings/media/renesas,vsp1.txt deleted file mode 100644 index cd5a955b2ea0..000000000000 --- a/Documentation/devicetree/bindings/media/renesas,vsp1.txt +++ /dev/null @@ -1,30 +0,0 @@ -* Renesas VSP Video Processing Engine - -The VSP is a video processing engine that supports up-/down-scaling, alpha -blending, color space conversion and various other image processing features. -It can be found in the Renesas R-Car Gen2, R-Car Gen3, RZ/G1, and RZ/G2 SoCs. - -Required properties: - - - compatible: Must contain one of the following values - - "renesas,vsp1" for the R-Car Gen2 and RZ/G1 VSP1 - - "renesas,vsp2" for the R-Car Gen3 and RZ/G2 VSP2 - - - reg: Base address and length of the registers block for the VSP. - - interrupts: VSP interrupt specifier. - - clocks: A phandle + clock-specifier pair for the VSP functional clock. - -Optional properties: - - - renesas,fcp: A phandle referencing the FCP that handles memory accesses - for the VSP. Not needed on Gen2, mandatory on Gen3. - - -Example: R8A7790 (R-Car H2) VSP1-S node - - vsp@fe928000 { - compatible = "renesas,vsp1"; - reg = <0 0xfe928000 0 0x8000>; - interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>; - }; diff --git a/Documentation/devicetree/bindings/media/renesas,vsp1.yaml b/Documentation/devicetree/bindings/media/renesas,vsp1.yaml new file mode 100644 index 000000000000..65e8ee61ce90 --- /dev/null +++ b/Documentation/devicetree/bindings/media/renesas,vsp1.yaml @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/renesas,vsp1.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Renesas VSP Video Processing Engine + +maintainers: + - Laurent Pinchart + +description: + The VSP is a video processing engine that supports up-/down-scaling, alpha + blending, color space conversion and various other image processing features. + It can be found in the Renesas R-Car Gen2, R-Car Gen3, RZ/G1, and RZ/G2 SoCs. + +properties: + compatible: + enum: + - renesas,vsp1 # R-Car Gen2 and RZ/G1 + - renesas,vsp2 # R-Car Gen3 and RZ/G2 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + renesas,fcp: + $ref: /schemas/types.yaml#/definitions/phandle + description: + A phandle referencing the FCP that handles memory accesses for the VSP. + +required: + - compatible + - reg + - interrupts + - clocks + +additionalProperties: false + +if: + properties: + compatible: + items: + - const: renesas,vsp1 +then: + properties: + renesas,fcp: false +else: + required: + - renesas,fcp + +examples: + # R8A7790 (R-Car H2) VSP1-S + - | + #include + #include + + vsp@fe928000 { + compatible = "renesas,vsp1"; + reg = <0xfe928000 0x8000>; + interrupts = ; + clocks = <&cpg CPG_MOD 131>; + }; + + # R8A77951 (R-Car H3) VSP2-BC + - | + #include + #include + + vsp@fe920000 { + compatible = "renesas,vsp2"; + reg = <0xfe920000 0x8000>; + interrupts = ; + clocks = <&cpg CPG_MOD 624>; + + renesas,fcp = <&fcpvb1>; + }; +... diff --git a/MAINTAINERS b/MAINTAINERS index 7383dfa510a3..22e079cc3e3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10730,7 +10730,7 @@ L: linux-media@vger.kernel.org L: linux-renesas-soc@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git -F: Documentation/devicetree/bindings/media/renesas,vsp1.txt +F: Documentation/devicetree/bindings/media/renesas,vsp1.yaml F: drivers/media/platform/vsp1/ MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs From patchwork Sun Jun 21 00:47:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 198746 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03447C433E7 for ; Sun, 21 Jun 2020 00:48:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CBA7424772 for ; Sun, 21 Jun 2020 00:48:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Nbci1orA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729121AbgFUAsN (ORCPT ); Sat, 20 Jun 2020 20:48:13 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:60972 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729079AbgFUAsM (ORCPT ); Sat, 20 Jun 2020 20:48:12 -0400 Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2FF90552; Sun, 21 Jun 2020 02:48:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592700486; bh=T2gCA4T8mtz1HoFQ2uWHrRsSxO+iWFnLgHfz0vIqZco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nbci1orAELj30VHuptm9yg3pkzxcWy6i5GZBfRrhLwIUSlEa1tYw44EhjxmgqAxuW 8uDUVQvBcgFt8BR9Ts8H9ICP61E2mg9LnSN9McxoYTKZOs3dRt0jIm3jfUBoywO39M RM25JSwZ5C8q+0yTXSlcxjXoWHFBfKaYL5qQ4hus= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Rob Herring Subject: [PATCH v2 8/8] dt-bindings: media: renesas, vsp1: Add power-domains and resets Date: Sun, 21 Jun 2020 03:47:34 +0300 Message-Id: <20200621004734.28602-9-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> References: <20200621004734.28602-1-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The power-domains and resets properties are used in all DT sources in the kernel but are absent from the bindings. Document them and make them mandatory. Signed-off-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Acked-by: Rob Herring --- .../devicetree/bindings/media/renesas,vsp1.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/devicetree/bindings/media/renesas,vsp1.yaml b/Documentation/devicetree/bindings/media/renesas,vsp1.yaml index 65e8ee61ce90..990e9c1dbc43 100644 --- a/Documentation/devicetree/bindings/media/renesas,vsp1.yaml +++ b/Documentation/devicetree/bindings/media/renesas,vsp1.yaml @@ -29,6 +29,12 @@ properties: clocks: maxItems: 1 + power-domains: + maxItems: 1 + + resets: + maxItems: 1 + renesas,fcp: $ref: /schemas/types.yaml#/definitions/phandle description: @@ -39,6 +45,8 @@ required: - reg - interrupts - clocks + - power-domains + - resets additionalProperties: false @@ -59,24 +67,30 @@ examples: - | #include #include + #include vsp@fe928000 { compatible = "renesas,vsp1"; reg = <0xfe928000 0x8000>; interrupts = ; clocks = <&cpg CPG_MOD 131>; + power-domains = <&sysc R8A7790_PD_ALWAYS_ON>; + resets = <&cpg 131>; }; # R8A77951 (R-Car H3) VSP2-BC - | #include #include + #include vsp@fe920000 { compatible = "renesas,vsp2"; reg = <0xfe920000 0x8000>; interrupts = ; clocks = <&cpg CPG_MOD 624>; + power-domains = <&sysc R8A7795_PD_A3VP>; + resets = <&cpg 624>; renesas,fcp = <&fcpvb1>; };