From patchwork Mon Nov 21 15:17:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 13051300 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA879C4332F for ; Mon, 21 Nov 2022 15:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fC4eMiVQCadFDUPVlhjArq1NgrubUU0HFGx8uRd2zFE=; b=H8shkLotEDR86C b1CZDrab4A4CWhi9VC+Ch81JR7m2zHcaBN33gG2iQFP75hmreKEjOhP1f9oGEWfDYFMjo/zA6vNYP +oYf4RU1ExlXb7W9ftEMiWHnwP0CE2qn0i7Q7bH2uOktzMQV6uwKK62QgGN7XbLY1rEbqjaXCOOyn wwW9KPE/ZvZOytBl7V5qwW4c4TSruFnx8Y3D71c76pdVyDZKzdD2KSwufxvf/oUu1eWG7+ASMibUX d81thyvb5LvVzXZQjNNXS+B3s46gspfiGJOnrpCoEE3SqL1Spwz0ug3y0Vn7YmSwrbd9LaXBG4cnD 8tK+Cb7GcXk2IIVLUZmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox8jq-00FCEy-VY; Mon, 21 Nov 2022 15:29:39 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox8Yl-00F5Ci-Fx for linux-arm-kernel@lists.infradead.org; Mon, 21 Nov 2022 15:18:16 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ox8Yb-0004BO-LZ; Mon, 21 Nov 2022 16:18:01 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ox8YV-005gHF-Ln; Mon, 21 Nov 2022 16:17:56 +0100 Received: from mtr by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ox8YV-008hFJ-KH; Mon, 21 Nov 2022 16:17:55 +0100 From: Michael Tretter To: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, jacob-chen@iotwrt.com, ezequiel@vanguardiasur.com.ar, robh+dt@kernel.org Cc: krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, michael.riesch@wolfvision.net, linux-arm-kernel@lists.infradead.org, m.tretter@pengutronix.de, kernel@pengutronix.de Subject: [PATCH 1/2] media: dt-bindings: media: rockchip-rga: add rockchip,rk3568-rga Date: Mon, 21 Nov 2022 16:17:54 +0100 Message-Id: <20221121151755.2072816-2-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221121151755.2072816-1-m.tretter@pengutronix.de> References: <20221121151755.2072816-1-m.tretter@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mtr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_071811_555644_47A43E3A X-CRM114-Status: GOOD ( 12.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Signed-off-by: Michael Tretter Acked-by: Krzysztof Kozlowski --- 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 Mon Nov 21 15:17:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tretter X-Patchwork-Id: 13051298 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AD87C4332F for ; Mon, 21 Nov 2022 15:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2DcdIkE0KMyQ15OwXj/0mvMoseBMQYAMCuHmH6mzDQo=; b=4k0uCLkfRZI0jt CM4XdxPRu8SJKfeviWTXIW3cdN1oF+1EyCPfuc2tb6KDoOFWViE4i4VGub/c4vQKEaY6CHSGNRgXt 5W08DBH+7DZXi2dnGTxdbBx5H1zKg60bsz7JvYV8RH9yqIfJFn3ZTDhsGmjqcnwo84Pff4Ss2NFSp RgSH29TFdl9UDD9v+FE3YoEh+LC2R2cfpOKgswo9UArfFBBrBLNBXVvYqa1Y3f1QgkEaqHTdLe8sR 8f9xUEHhc3L4oEBm5dcLYV4c/7r7LoO9262zpO11120sJbN4lcDCfOUyT0TdOHssPuMYl8CfyYklV Wd9lptfIxQMnBvKkDqbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox8ia-00FBZJ-SQ; Mon, 21 Nov 2022 15:28:21 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox8Yk-00F5Cv-JU for linux-arm-kernel@lists.infradead.org; Mon, 21 Nov 2022 15:18:14 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ox8Yb-0004BP-LZ; Mon, 21 Nov 2022 16:18:01 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ox8YV-005gHE-LR; Mon, 21 Nov 2022 16:17:56 +0100 Received: from mtr by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ox8YV-008hFM-Kk; Mon, 21 Nov 2022 16:17:55 +0100 From: Michael Tretter To: devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, jacob-chen@iotwrt.com, ezequiel@vanguardiasur.com.ar, robh+dt@kernel.org Cc: krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, michael.riesch@wolfvision.net, linux-arm-kernel@lists.infradead.org, m.tretter@pengutronix.de, kernel@pengutronix.de Subject: [PATCH 2/2] arm64: dts: rockchip: Add RGA2 support to rk356x Date: Mon, 21 Nov 2022 16:17:55 +0100 Message-Id: <20221121151755.2072816-3-m.tretter@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221121151755.2072816-1-m.tretter@pengutronix.de> References: <20221121151755.2072816-1-m.tretter@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mtr@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_071810_695180_1308326E X-CRM114-Status: GOOD ( 10.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The rk3568 also features a RGA2 block. Add the necessary device tree node. Signed-off-by: Michael Tretter Acked-by: Nicolas Frattaroli --- 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 164708f1eb67..0b281e2260d9 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>;