From patchwork Wed May 11 08:21:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 12845926 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 95BB3C433F5 for ; Wed, 11 May 2022 08:22:26 +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=z+GlrLojfnfMwcjSgd/0EPEiD5Jntz7qk1+xeGIcN30=; b=hTZtxx3SR/w8GY TesGRn4xnzNG5vxb9eeVDBsSr0xTKRZ90hjrE1U3CB9jjdiAr4rTBJE5DSxw03Zv8GB0ipgLVHF/7 4ATh9JcdATuRaGDY0LcddOHGAdtcatn9XDy4ajVi89MGn6a9vTUmuCYzbC+7EFG0kYDGxSF9IhggA DIKSYC26Vf5FNPvfLvOK5R9AccoOOVg22aRdH4tFSzi5ezUyl8iGaerVmKx0bAhdMW3K78xsZ+HNN ibQsmFgk/gSMui2FuUFd4T5dCFftFqYOS7xCT65ROg7xHsVdPVNp/LRgQoHR6HEFjJUxgo4g/OW9C htadwQgEv6C//6HxX6Ew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nohay-005sv6-P0; Wed, 11 May 2022 08:21:20 +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 1nohav-005ssi-04 for linux-arm-kernel@lists.infradead.org; Wed, 11 May 2022 08:21:18 +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 1nohat-0002Ur-0j; Wed, 11 May 2022 10:21:15 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nohaq-001eQL-Mw; Wed, 11 May 2022 10:21:11 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nohao-004lUL-LA; Wed, 11 May 2022 10:21:10 +0200 From: Sascha Hauer To: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, kernel@pengutronix.de, Andy Yan , Benjamin Gaignard , Michael Riesch , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Peter Geis , Sascha Hauer Subject: [PATCH v2 1/3] dt-bindings: display: rockchip: make reg-names mandatory for VOP2 Date: Wed, 11 May 2022 10:21:07 +0200 Message-Id: <20220511082109.1110043-2-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220511082109.1110043-1-s.hauer@pengutronix.de> References: <20220511082109.1110043-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@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-20220511_012117_069807_10E0FA7E X-CRM114-Status: GOOD ( 11.91 ) 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 VOP2 driver relies on reg-names properties, but these are not documented. Add the missing documentation, make reg-names mandatory and increase minItems to 2 as always both register spaces are needed. Signed-off-by: Sascha Hauer Reviewed-by: Rob Herring --- Notes: Changes since v1: - Drop minItems - Add reg-names properties to example .../bindings/display/rockchip/rockchip-vop2.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml index 655d9b327f7d3..fba45091d9092 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml @@ -22,7 +22,6 @@ properties: - rockchip,rk3568-vop reg: - minItems: 1 items: - description: Must contain one entry corresponding to the base address and length @@ -31,6 +30,11 @@ properties: Can optionally contain a second entry corresponding to the CRTC gamma LUT address. + reg-names: + items: + - const: vop + - const: gamma-lut + interrupts: maxItems: 1 description: @@ -86,6 +90,7 @@ properties: required: - compatible - reg + - reg-names - interrupts - clocks - clock-names @@ -104,6 +109,7 @@ examples: vop: vop@fe040000 { compatible = "rockchip,rk3568-vop"; reg = <0x0 0xfe040000 0x0 0x3000>, <0x0 0xfe044000 0x0 0x1000>; + reg-names = "vop", "gamma-lut"; interrupts = ; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>, From patchwork Wed May 11 08:21:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 12845927 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 450FEC433FE for ; Wed, 11 May 2022 08:22: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=Ld/hNzRJ1nRVMY6tXTwy/W1PZKw7hS/OIXko6fUAkDI=; b=ay+ZhtJoDDGiCj g72d5T1Zy+lmHTFDGe5MqilwT0U+Ha0hAJi9bKtXMHykap1DIagPoHxWwGC7OtfqIZF6FL+2fo1gZ ejunEkXqTZgMkdF0TuW00z02V9Ag5x4B6MJVKVy5UZ1fd6Do9+E7EKCWDEbDeBGjmUkNdDIzlmlC+ 5CmLwHu0QOuyr6o6qbyNK2GKQGLn0aAtvZ7IGd0ZQN6IPRDkhpwMIfsZRiH4n/gXSujN2ApRQOetu cls/SHVUEdqy3D3ofD9AOsedHNVydRqR5dtudLEAxcPtAHn2qrLyTGriTnL0GJl7QtIQteuta7Nr6 uSSusWKROpIg3ucB7XEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nohb7-005syH-E1; Wed, 11 May 2022 08:21:29 +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 1nohb2-005swA-E6 for linux-arm-kernel@lists.infradead.org; Wed, 11 May 2022 08:21:25 +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 1nohat-0002Us-0i; Wed, 11 May 2022 10:21:15 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nohaq-001eQN-Nn; Wed, 11 May 2022 10:21:11 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nohao-004lV3-My; Wed, 11 May 2022 10:21:10 +0200 From: Sascha Hauer To: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, kernel@pengutronix.de, Andy Yan , Benjamin Gaignard , Michael Riesch , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Peter Geis , Sascha Hauer Subject: [PATCH v2 2/3] drm: rockchip: Change register space names Date: Wed, 11 May 2022 10:21:08 +0200 Message-Id: <20220511082109.1110043-3-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220511082109.1110043-1-s.hauer@pengutronix.de> References: <20220511082109.1110043-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@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-20220511_012124_510418_2DA352B1 X-CRM114-Status: GOOD ( 13.37 ) 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 "regs" seems to generic when there are multiple register spaces, so rename that one to "vop". Also change "gamma_lut" to better looking "gamma-lut". Signed-off-by: Sascha Hauer --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 8d1323a47f822..d463ea80b6569 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2620,7 +2620,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) dev_set_drvdata(dev, vop2); - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vop"); if (!res) { drm_err(vop2->drm, "failed to get vop2 register byname\n"); return -EINVAL; @@ -2637,7 +2637,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma_lut"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gamma-lut"); if (res) { vop2->lut_regs = devm_ioremap_resource(dev, res); if (IS_ERR(vop2->lut_regs)) From patchwork Wed May 11 08:21:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 12845928 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 73339C433FE for ; Wed, 11 May 2022 08:22:41 +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=BV+TNriRlblZzGXYpLCOEveZbT7DiravV0o3IRXSNnc=; b=jlH92Ij3xwV+jw SstSy3uXSz9cRDph32SoZqcwW6SgB+DtDm/OY/6qvv9a2aVyIUmaWY4Fdxi0fhQZ3njYuQevMxy7z 9ep4n7pVMA6VD0c5Q2I/TbLIjwQ4YfClbiJD7AMw+RDNRfXPfb/Sb9sK/kEyaW5hQ28vyZt1p7Km+ IBJeOeaTjPHcpje3NgWTDkSiGUPSm089qyPz10tF6ViSdyJZ/NCLiq7yWz8YsP5thRNBIjqBzBO9l 01gIs/iuzqKwA2r/mp5IAkZu4sksAwfDYUS4/S6EzcKwMT34jQ51+6u6pljB7O3vfqIbxl9Grhics 5Tl489+qnS5z4XkdVgsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nohbG-005t4K-RP; Wed, 11 May 2022 08:21:38 +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 1nohbA-005szF-VT for linux-arm-kernel@lists.infradead.org; Wed, 11 May 2022 08:21:34 +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 1nohat-0002Uu-0i; Wed, 11 May 2022 10:21:15 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nohaq-001eQU-Te; Wed, 11 May 2022 10:21:11 +0200 Received: from sha by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nohao-004lW3-Nd; Wed, 11 May 2022 10:21:10 +0200 From: Sascha Hauer To: dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, kernel@pengutronix.de, Andy Yan , Benjamin Gaignard , Michael Riesch , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Peter Geis , Sascha Hauer Subject: [PATCH v2 3/3] arm64: dts: rockchip: rk356x: Change VOP2 register space names Date: Wed, 11 May 2022 10:21:09 +0200 Message-Id: <20220511082109.1110043-4-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220511082109.1110043-1-s.hauer@pengutronix.de> References: <20220511082109.1110043-1-s.hauer@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: sha@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-20220511_012133_051194_B1FD0C47 X-CRM114-Status: GOOD ( 13.45 ) 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 "regs" seems to generic when there are multiple register spaces, so rename to "vop". Also, replace "gamma_lut" with better looking "gamma-lut". This has been changed in the driver and binding documentation as well. Signed-off-by: Sascha Hauer --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 49eb45e23f8c9..646e60ee48c99 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -576,7 +576,7 @@ gmac1_mtl_tx_setup: tx-queues-config { vop: vop@fe040000 { reg = <0x0 0xfe040000 0x0 0x3000>, <0x0 0xfe044000 0x0 0x1000>; - reg-names = "regs", "gamma_lut"; + reg-names = "vop", "gamma-lut"; interrupts = ; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>, <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;