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 90846C98317 for ; Thu, 24 Sep 2026 11:08:55 +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=ocPww4fOUVxD8WA0/iboMXnVhK/OfxYzt1SV97NVpXI=; b=IVoS0nkcaavuQK cBopbsD+4XORRraPw/t+IBCilgdi/+rjAtvI0gS7uFLhFXMt48BVopLjgYzu0up/OaECxL8CsVYlW mBV35tIgjMPF6XISOOTOXp3g5sHLB2RzxIYl48m6A6XDOyuQF7IKuNvVCuj947w961sK/cxxt8t+z sRgd+P8cf/bC9z2UoKK/f4e8Bt4LrHCe/tUAWU6g8COjXPiF0rIOBKW2u3ivKk/gsfVHxusbC4P15 WIemZ9KHYiUHcCzuf5mMBLdsBQFA0n7MtSGc73kuoJmGzHrWdpW9wYTxvcnEIgHndqnzBVuAtyZ3/ 6DlJKkmnw87V2aQeMcTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9hJt-0000000AooY-1R73; Thu, 24 Sep 2026 11:08:53 +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 1x9hJn-0000000Aoky-2cla; Thu, 24 Sep 2026 11:08:47 +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=+0Je0qZg/wNYnfcI4LDtGMGXD7CyFlhG5d2t6KkTqSQ=; b=CHZAmHCPnGsJCa+qFawibtQge6 BQxw9Ek+ntqM6cEDjV6EbGSl6J/hTvlZq/xwM/FMMDHcWrWx6vGOMJJxrV/epZ+fQDjL/GgKa/BcL dDJBXiHDg7/BvgbL+KFj8zKtew9qwTTRK8qoIBdbAOIVm7GQdL4zAw9AJh737UScy2etWrz/vzBIa 2URk04V9dEfnL5f1RXvO2rU5sKhr+h/qlhqOUDvslILS5Q/78JMez+vPZ/Od/S6hw7PqDwyQHhM4d HChFxipuekfZ/7fMtOrF20mTWOE6F6H/t2CrAxI7FShHO5Mnol5IqY8a4Oftr28cjmFUtd2QZ/4qc h+i4fpWQ==; Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1x9hJf-0000000Fsrq-49NU; Thu, 24 Sep 2026 11:08:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1790248113; bh=t7HK1oq4mCwhdhAy8SUPdPahzvOZhLavDwHLqnkVlbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MuSc8ZUOY0t9GYN+zAVZieFcMEG/RHf9nXPovYDDZofeBzfnuHzaHzI1nVyo8tMsV d44vPBLtNkhU+0oJxEzNE7X4uOxSzZyPFvts9hfbTtVJCJ7X+S1LukUN6jV9fffiil YRqipPWj95kx6y0I2Dr+eoUl/TZ74IAGhdPYz3pCzTuPVNzXjdr29/fEZgg2WcTr0K dyeUE/suVZPSDdW21WobusGsBwIb8d/h4KAonpgFEzDuw3cK+1GNyWB05i+D0CwFVY ry5BI05or/sLW33vKycBQx886OWETR8T85Gac7pejL8+ymr5XZVth99PARN0ezc3Ms rDyCmEOMIv4IQ== Received: from benjamin-XPS-13-9310 (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 A629517E0B0F; Thu, 24 Sep 2026 13:08:32 +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 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 v2 3/3] media: verisilicon: Remove useless internal fields Date: Thu, 24 Sep 2026 13:08:25 +0200 Message-ID: <20260924110825.166238-4-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260924110825.166238-1-benjamin.gaignard@collabora.com> References: <20260924110825.166238-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260924_120842_876764_48872B53 X-CRM114-Status: GOOD ( 14.37 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org No more variants are using multiple registers regions. Remove the useless fields and simplify driver code. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/verisilicon/hantro.h | 8 ++------ .../media/platform/verisilicon/hantro_drv.c | 20 +++++-------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h index 0353de154a1e..20c3afb3b817 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,7 +180,7 @@ 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. @@ -204,7 +200,7 @@ 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; diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 70de47ddb023..f418b0427985 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); @@ -1137,21 +1136,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 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip