From mboxrd@z Thu Jan 1 00:00:00 1970 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 2D24ECA5FCE for ; Wed, 30 Sep 2026 15:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oeuwfl/r2llkh9/n/Ud53I5ZqLTqwtmAXnTWTemU7/0=; b=QQ94s0F6GZYfISr1+EpWi8Chfa ZEZfSzAsWZ9WDFeBFNKRXeuR/hrbFTAvrs3rZ96o8f3X4M5Caz43dPNOhitpO6/KoaQonOZVfSIJ/ 8Fam6W/agN8scHuiZXZrbx6MIxt8lkUPcIxrtq6tnmKfttIGOlcegToYDAIrGWw3XxvCHy7xTighF GZ3811gGe4IFzWl4VCBnlwkkNdAzLim2/Jba2oufZVG+mAsaHqIQCCwZ0a+s5DTpOcaxPjGK2OD1M G1Xtp5w6jJyakPevk6e1rwccVbNmDXqe7g3aH4+PXRO5Ih1QodFFEH4KdW2U/PdqdNmAFZkopLOqy DttoVyiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBvze-00000006Ry0-12Vb; Wed, 30 Sep 2026 15:13:14 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBvzM-00000006RnP-0YBB; Wed, 30 Sep 2026 15:12:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=oeuwfl/r2llkh9/n/Ud53I5ZqLTqwtmAXnTWTemU7/0=; b=PgR7r8dzPKK4trI2R2a1u205FN DY+XUOiwRIQMJdY5Sfsht3GSP7SrUgUKO9xFWe49kbcmIWNKXRTeV6fTQqZ/ujHN5WBckq8wick34 +2bXeqomWX18qCQpGIFl7YJ8Om997LRkThtLSmVVhNSKgIrqBmUM4ZMHJkbGlStz6LprLcU6Wh78X 5v2u2gjIJfFSQ0OsGCC07ez5g0iihKjow4EKvpSIR8z0NEbLD6AuAfLxt1/I6yOrSgDXDgNsq4rto WTtrgORdIcrrXd3Fa5mQgW2EaR3b56qv+NQV3TF+x+/ZPu1nf4kVaivB57N3bKKnzQEMpjOYJzC77 ObZ1to8w==; Received: from bali.collaboradmins.com ([148.251.105.195]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1xBvzI-00000003yRo-1NTM; Wed, 30 Sep 2026 15:12:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1790781168; bh=tElqHsQAF81nSVcFmZVlrfQ5KqZwzfeG/qXHFWZj4kM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C37Dy2Wad9G62e0t9nbuSy6sfbTWxrv7qVmlZ9CUkOM3J9SjaPtXxwWrWXB/isdcc QQ8xOCZsxEpEPcrSnLDnCkGwTWiobf959eDy7zWkZKGHHHexI3TqvEnRWnQyWVivyZ e+KFwQUj1d2pmtFRWgJGjgcxOjzsCcAUaY3t+9uWVuKaWeMfPG3/Pqo2PM5tecprRx dnSAoZT8u+USM/rgbptmj+EuSFRL/uH7nUgowZLoSu6CUoHRbZ8oy7dKahOiUzeaIr ryUXRJNGPTtirYKjpPy0NR8XKeEAWYhx5FVTCkOafoDy2YClj3fRVoqW9PTCGlC9aD 0IXLLRRUE3g2g== Received: from benjamin-XPS-13-9310.home (unknown [100.64.1.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6C80417E0D5D; Wed, 30 Sep 2026 17:12:48 +0200 (CEST) From: Benjamin Gaignard To: nicolas.dufresne@collabora.com, benjamin.gaignard@collabora.com, p.zabel@pengutronix.de, mchehab@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, Frank.Li@nxp.com, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, conor@kernel.org Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v6 3/3] media: verisilicon: Remove useless internal fields Date: Wed, 30 Sep 2026 17:12:41 +0200 Message-ID: <20260930151241.58233-4-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260930151241.58233-1-benjamin.gaignard@collabora.com> References: <20260930151241.58233-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260930_161252_502232_13F9822A X-CRM114-Status: GOOD ( 17.31 ) 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 No more variants are using multiple registers regions so rename reg_bases to reg_base. Remove the useless fields and simplify driver code. Signed-off-by: Benjamin Gaignard Reviewed-by: Frank Li --- drivers/media/platform/verisilicon/hantro.h | 10 ++-------- .../media/platform/verisilicon/hantro_drv.c | 20 +++++-------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h index 0353de154a1e..f85035a98b28 100644 --- a/drivers/media/platform/verisilicon/hantro.h +++ b/drivers/media/platform/verisilicon/hantro.h @@ -72,8 +72,6 @@ struct hantro_irq { * @num_irqs: number of irqs in the array * @clk_names: array of clock names * @num_clocks: number of clocks in the array - * @reg_names: array of register range names - * @num_regs: number of register range names in the array * @double_buffer: core needs double buffering * @legacy_regs: core uses legacy register set * @late_postproc: postproc must be set up at the end of the job @@ -97,8 +95,6 @@ struct hantro_variant { int num_irqs; const char * const *clk_names; int num_clocks; - const char * const *reg_names; - int num_regs; unsigned int double_buffer : 1; unsigned int legacy_regs : 1; unsigned int late_postproc : 1; @@ -184,10 +180,9 @@ hantro_vdev_to_func(struct video_device *vdev) * dev_ macros. * @clocks: Array of clock handles. * @resets: Array of reset handles. - * @reg_bases: Mapped addresses of VPU registers. + * @reg_base: Mapped address of VPU registers. * @enc_base: Mapped address of VPU encoder register for convenience. * @dec_base: Mapped address of VPU decoder register for convenience. - * @ctrl_base: Mapped address of VPU control block. * @vpu_mutex: Mutex to synchronize V4L2 calls. * @irqlock: Spinlock to synchronize access to data structures * shared with interrupt handlers. @@ -204,10 +199,9 @@ struct hantro_dev { struct device *dev; struct clk_bulk_data *clocks; struct reset_control *resets; - void __iomem **reg_bases; + void __iomem *reg_base; void __iomem *enc_base; void __iomem *dec_base; - void __iomem *ctrl_base; struct mutex vpu_mutex; /* video_device lock */ spinlock_t irqlock; diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 12c804dcc669..6e3a24156a69 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -1080,7 +1080,6 @@ static int hantro_probe(struct platform_device *pdev) { const struct of_device_id *match; struct hantro_dev *vpu; - int num_bases; int i, ret; vpu = devm_kzalloc(&pdev->dev, sizeof(*vpu), GFP_KERNEL); @@ -1128,21 +1127,12 @@ static int hantro_probe(struct platform_device *pdev) if (IS_ERR(vpu->resets)) return PTR_ERR(vpu->resets); - num_bases = vpu->variant->num_regs ?: 1; - vpu->reg_bases = devm_kcalloc(&pdev->dev, num_bases, - sizeof(*vpu->reg_bases), GFP_KERNEL); - if (!vpu->reg_bases) - return -ENOMEM; + vpu->reg_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(vpu->reg_base)) + return PTR_ERR(vpu->reg_base); - for (i = 0; i < num_bases; i++) { - vpu->reg_bases[i] = vpu->variant->reg_names ? - devm_platform_ioremap_resource_byname(pdev, vpu->variant->reg_names[i]) : - devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(vpu->reg_bases[i])) - return PTR_ERR(vpu->reg_bases[i]); - } - vpu->enc_base = vpu->reg_bases[0] + vpu->variant->enc_offset; - vpu->dec_base = vpu->reg_bases[0] + vpu->variant->dec_offset; + vpu->enc_base = vpu->reg_base + vpu->variant->enc_offset; + vpu->dec_base = vpu->reg_base + vpu->variant->dec_offset; /** * TODO: Eventually allow taking advantage of full 64-bit address space. -- 2.53.0