From patchwork Fri Jan 20 09:14:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 46227 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp95731wrn; Fri, 20 Jan 2023 01:16:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXv7HGxEVWxQubJkihZPJBr7FwoYmjEPlfKS3jg5lQ8Mp8Ty2rFMuqLOUYBgbvbEiuOTlWeU X-Received: by 2002:a05:6402:4284:b0:499:b672:ee30 with SMTP id g4-20020a056402428400b00499b672ee30mr18074261edc.11.1674206197892; Fri, 20 Jan 2023 01:16:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674206197; cv=none; d=google.com; s=arc-20160816; b=iKF2SA/41uheqGDk0TinFN5Ucc3py6zPCLmmsqsTHow1XU5zfkCu6Age7+vu2dnU/K ZjJhuh1UX6i72iPuwvXumMbhWhH3GrbRWXfpy3x0WbSyrWSCctjMBzWtzjsEXbYVHVFQ Oa98UqOtRRB9A9WT+YYY/gkpos1VnYI2QK+l06zeh/8IDfb/oB6s5l4UvGAy+GmkQQM9 Iypnxrn7T7jOU0mKgjupXCdolfSC4wzh64Nu8qO6UtjU5q0OW6kTyYQ4/yIdvDRW3r5T sUV4/OvsqV84H9M0TZNlzW+axaGvHqYW4gq4tyBByXzqdOQkT78ZHQDE6dwvgcVT+isn +0hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=8CVVVXhoIhOceBN2RdmxUj55qIMnJQF/R09MBsFNEcc=; b=IL218Xi/baI/QzvHWPJGI3AWLHHwCckuAjKHhgBN/4jq5w/Ct3h9B5RZO8umgE7ZnQ zh1n2RsB0WtSTKShK57UabiwJ+CFObwZKMl702Z1rw3MuAE4j6Unj8qDlFdLPvpnuK4x 2MAU1HtBQwmGdHBNJjAL3EH6TubGuDLhBjFC4cOMilS+cloolE924UADiPZ9C9Xr37gq RISBDNoozVTggJUNLJMcT+b6HluNlowUTSulMtGmSID+g4d65FUoa1QIxvm4XOZdpeQN 8MxV5t+B0YGD1hLHCYi1lWuOkp9ePxaqMEjpQK/2nqEklSNxb/kmMJZqYhnjyvkphgyX DIjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o3-20020aa7dd43000000b00486b6bfad93si16949703edw.421.2023.01.20.01.16.13; Fri, 20 Jan 2023 01:16:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbjATJPR (ORCPT + 99 others); Fri, 20 Jan 2023 04:15:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229987AbjATJPI (ORCPT ); Fri, 20 Jan 2023 04:15:08 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D8538CE46 for ; Fri, 20 Jan 2023 01:14:48 -0800 (PST) Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pInTf-0001QK-QB; Fri, 20 Jan 2023 10:14:27 +0100 From: Michael Tretter Date: Fri, 20 Jan 2023 10:14:21 +0100 Subject: [PATCH RESEND 1/2] media: dt-bindings: media: rockchip-rga: add rockchip,rk3568-rga MIME-Version: 1.0 Message-Id: <20230119-rk3568-rga-v1-1-43d4d14365e6@pengutronix.de> References: <20230119-rk3568-rga-v1-0-43d4d14365e6@pengutronix.de> In-Reply-To: <20230119-rk3568-rga-v1-0-43d4d14365e6@pengutronix.de> To: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Nicolas Frattaroli , Michael Tretter X-Mailer: b4 0.11.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::54 X-SA-Exim-Mail-From: m.tretter@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755532438186486899?= X-GMAIL-MSGID: =?utf-8?q?1755532438186486899?= Add a new compatible for the rk3568 Rockchip SoC, which also features an RGA, which is called RGA2 in the TRM Part2. It is the same core as used on the rk3288, which documents the same RGA2. Specify a new compatible for the rk3568 to be able to handle unknown SoC-specific differences in the driver. Acked-by: Krzysztof Kozlowski Signed-off-by: Michael Tretter Reviewed-by: Heiko Stuebner Reviewed-by: Ezequiel Garcia --- Documentation/devicetree/bindings/media/rockchip-rga.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/rockchip-rga.yaml b/Documentation/devicetree/bindings/media/rockchip-rga.yaml index dd645ddccb07..ea2342222408 100644 --- a/Documentation/devicetree/bindings/media/rockchip-rga.yaml +++ b/Documentation/devicetree/bindings/media/rockchip-rga.yaml @@ -21,7 +21,9 @@ properties: - const: rockchip,rk3288-rga - const: rockchip,rk3399-rga - items: - - const: rockchip,rk3228-rga + - enum: + - rockchip,rk3228-rga + - rockchip,rk3568-rga - const: rockchip,rk3288-rga reg: From patchwork Fri Jan 20 09:14:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 46226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp95503wrn; Fri, 20 Jan 2023 01:16:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOhzRIPzRnYos/qcuCXn3QeQnQ2uXuQGm+PftTlOjlF1JMPboL9xC9mhovWrEhToGr+9Lb X-Received: by 2002:a17:907:1107:b0:870:e329:5f2f with SMTP id qu7-20020a170907110700b00870e3295f2fmr14587894ejb.51.1674206163704; Fri, 20 Jan 2023 01:16:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674206163; cv=none; d=google.com; s=arc-20160816; b=yM0XqK/8olAASwZuaGwod/jfpRvkN0WlcZkXTI8sVshgi7byiD/rZt9FjCFZMtrNwW tP9ixvGea74vUWkeZ5qfGLw+ssdQc4vXuKNrm1S0AsX9dTBkGFSeFBtXhCdZwMQL05cY etTun958PCCfTm51QkMHSK7YkaQDizJKgEu5XbkeJ1Gi2VCC/jZMFQFcJEqKeKjX9QFd iE8JOwuBnq6QdE8FvDjj31Zyb6zyDziLay4QwQioMPt2JFFKXBC5vKtNesdUdeq0ccJf VqVwnbbBo2bqXdoTutW9i8uQbQLMV2nWPQl2SbutfWdFyDuArKAhibwHrVOMMUiPJ9bT mK7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=iluUZMu4oDqFyHXnV6SpcJUQbsFRrpGMEAnMLOPsUkI=; b=tb6iY9DU26M5ZynQe4GdawJHTOSGHa77isQc6FUHBNo0A1Coi0ex83drSJP6fbVHdY Dhk6mYigean4j8BGQE2bv8AWFtweZ/jzhUW3gV+TGer30ejc1fQve2VdRngTM4d+/JZz s3ejz/GjFm9gbmh3Lh3AOLM4tXc52UlJMnZaOaTvxbFh2zL3GB+jU9D7wlizdrDGiCwZ H6WS9eKlH9HoYXZgkv5ZTRj8ztcc2sRP//RfRiIXbDzG0MXfgzNcTZqX0xG7UnhUrAg4 rUrq89n7MsSgcxu4KBLoKf8k11AwYcMyUp0ZKIH6nzytB+WTBVFzoDuK4o1YilGyazSZ KmRQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f19-20020a056402195300b0049defeaec6dsi21461281edz.530.2023.01.20.01.15.40; Fri, 20 Jan 2023 01:16:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230023AbjATJPP (ORCPT + 99 others); Fri, 20 Jan 2023 04:15:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229967AbjATJPH (ORCPT ); Fri, 20 Jan 2023 04:15:07 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 678528BA92 for ; Fri, 20 Jan 2023 01:14:47 -0800 (PST) Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pInTg-0001QK-Bq; Fri, 20 Jan 2023 10:14:28 +0100 From: Michael Tretter Date: Fri, 20 Jan 2023 10:14:22 +0100 Subject: [PATCH RESEND 2/2] arm64: dts: rockchip: Add RGA2 support to rk356x MIME-Version: 1.0 Message-Id: <20230119-rk3568-rga-v1-2-43d4d14365e6@pengutronix.de> References: <20230119-rk3568-rga-v1-0-43d4d14365e6@pengutronix.de> In-Reply-To: <20230119-rk3568-rga-v1-0-43d4d14365e6@pengutronix.de> To: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Nicolas Frattaroli , Michael Tretter X-Mailer: b4 0.11.2 X-SA-Exim-Connect-IP: 2a0a:edc0:0:1101:1d::54 X-SA-Exim-Mail-From: m.tretter@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755532402280756213?= X-GMAIL-MSGID: =?utf-8?q?1755532402280756213?= The rk3568 also features a RGA2 block. Add the necessary device tree node. Acked-by: Nicolas Frattaroli Signed-off-by: Michael Tretter Acked-by: Sakari Ailus --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 5706c3e24f0a..704b13f7f717 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -612,6 +612,17 @@ vdpu_mmu: iommu@fdea0800 { #iommu-cells = <0>; }; + rga: rga@fdeb0000 { + compatible = "rockchip,rk3568-rga", "rockchip,rk3288-rga"; + reg = <0x0 0xfdeb0000 0x0 0x180>; + interrupts = ; + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru CLK_RGA_CORE>; + clock-names = "aclk", "hclk", "sclk"; + resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>; + reset-names = "core", "axi", "ahb"; + power-domains = <&power RK3568_PD_RGA>; + }; + vepu: video-codec@fdee0000 { compatible = "rockchip,rk3568-vepu"; reg = <0x0 0xfdee0000 0x0 0x800>;