From nobody Thu Sep 24 13:01:01 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 987E64749D8; Thu, 24 Sep 2026 11:08:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248118; cv=none; b=EFtQhBtYU+4MzxuLXJxJCMc++XyayK79cq2leWxIYYjjMHH1dd+54o9A4a6k2DCog3mUgr0aQJD+uorMIYM4UhFChsnCxREHmKoz0hHGqu+CKDtxj1J8muXWSbXwfoUauVgVzkPIuBUELpfzgfhQj/YshCWJeZXpUez8SttIPtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248118; c=relaxed/simple; bh=FyrgrY+gcu57fBvOa26V251Gna+wPbxTxPIk53n2MVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BsVtJUlJIrc6XZ9B8aFGzmMyzLnF95ZET6nRmCn+MzbLamWcV0k5TqzPu8FHNNRBn0VQ/zGhUdIdOUr+9rskEmCr4mCY2b/yN6Nv7OIC+n9/9b25IJz9FvvxHuuu5e+1UHrg3MxwrKHXKs+Y3yQ7dqGRqwHB7aNStEcgXe4/r94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=aGGlsGWm; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="aGGlsGWm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1790248112; bh=FyrgrY+gcu57fBvOa26V251Gna+wPbxTxPIk53n2MVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGGlsGWmjpqPeVHmoAh/AO5PMeK3RmdkMXSyly9c962GTl3LXslXFYvDEQmWfmAzL MNhfpmlB8YR+Tv6ypjbFmhsKs3tqSfXCnIHSLu8YqZBILwC4MvdzMMaJTcsKd8aOtz /26OIcunI0TysqxJqqTamSLl4YITe+PYRsSH9OpeYGfZ2pEmkOcOLSV3Ea07R2Kwg/ z5cwyA95ZLRkJIR5grv63FGu601bN/+kjb2SNoK1vVYnxgqLzyb+Dtct0NEL1q9r87 CwEsR4T50Oh5vLe28DsDSOMvdExK3gRgavQpIcCZAzrt9IDjbNWjQ1BtcHWRtJDhzv cJo7MJtPlHoMg== 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 830C717E01D1; Thu, 24 Sep 2026 13:08:31 +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 1/3] media: verisilicon: Remove deprecated variant Date: Thu, 24 Sep 2026 13:08:23 +0200 Message-ID: <20260924110825.166238-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" "nxp,imx8mq-vpu" is tagged as deprecated since: commit f3116f2e52e6 ("media: dt-bindings: media: nxp, imx8mq-vpu: Split G1 = and G2 nodes") merged since v5.17-rc1. There is more reference to it since that. Remove for driver to clean up the code. Signed-off-by: Benjamin Gaignard --- changes in v2: - have a separate patch for documentation - rebased on v7.3-rc1 .../media/platform/verisilicon/hantro_drv.c | 1 - .../media/platform/verisilicon/imx8m_vpu_hw.c | 60 ------------------- 2 files changed, 61 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/medi= a/platform/verisilicon/hantro_drv.c index ad71c0402ef3..70de47ddb023 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -725,7 +725,6 @@ static const struct of_device_id of_hantro_match[] =3D { #endif #ifdef CONFIG_VIDEO_HANTRO_IMX8M { .compatible =3D "nxp,imx8mm-vpu-g1", .data =3D &imx8mm_vpu_g1_variant, = }, - { .compatible =3D "nxp,imx8mq-vpu", .data =3D &imx8mq_vpu_variant, }, { .compatible =3D "nxp,imx8mq-vpu-g1", .data =3D &imx8mq_vpu_g1_variant }, { .compatible =3D "nxp,imx8mq-vpu-g2", .data =3D &imx8mq_vpu_g2_variant }, #endif diff --git a/drivers/media/platform/verisilicon/imx8m_vpu_hw.c b/drivers/me= dia/platform/verisilicon/imx8m_vpu_hw.c index fa4224de4b99..3b63f626d33f 100644 --- a/drivers/media/platform/verisilicon/imx8m_vpu_hw.c +++ b/drivers/media/platform/verisilicon/imx8m_vpu_hw.c @@ -42,38 +42,6 @@ static void imx8m_soft_reset(struct hantro_dev *vpu, u32= reset_bits) writel(val, vpu->ctrl_base + CTRL_SOFT_RESET); } =20 -static void imx8m_clk_enable(struct hantro_dev *vpu, u32 clock_bits) -{ - u32 val; - - val =3D readl(vpu->ctrl_base + CTRL_CLOCK_ENABLE); - val |=3D clock_bits; - writel(val, vpu->ctrl_base + CTRL_CLOCK_ENABLE); -} - -static int imx8mq_runtime_resume(struct hantro_dev *vpu) -{ - int ret; - - ret =3D clk_bulk_prepare_enable(vpu->variant->num_clocks, vpu->clocks); - if (ret) { - dev_err(vpu->dev, "Failed to enable clocks\n"); - return ret; - } - - imx8m_soft_reset(vpu, RESET_G1 | RESET_G2); - imx8m_clk_enable(vpu, CLOCK_G1 | CLOCK_G2); - - /* Set values of the fuse registers */ - writel(0xffffffff, vpu->ctrl_base + CTRL_G1_DEC_FUSE); - writel(0xffffffff, vpu->ctrl_base + CTRL_G1_PP_FUSE); - writel(0xffffffff, vpu->ctrl_base + CTRL_G2_DEC_FUSE); - - clk_bulk_disable_unprepare(vpu->variant->num_clocks, vpu->clocks); - - return 0; -} - /* * Supported formats. */ @@ -234,13 +202,6 @@ static const struct hantro_fmt imx8m_vpu_g2_dec_fmts[]= =3D { }, }; =20 -static int imx8mq_vpu_hw_init(struct hantro_dev *vpu) -{ - vpu->ctrl_base =3D vpu->reg_bases[vpu->variant->num_regs - 1]; - - return 0; -} - static void imx8m_vpu_g1_reset(struct hantro_ctx *ctx) { struct hantro_dev *vpu =3D ctx->dev; @@ -319,30 +280,9 @@ static const struct hantro_irq imx8mq_g2_irqs[] =3D { { "g2", hantro_g2_irq }, }; =20 -static const char * const imx8mq_clk_names[] =3D { "g1", "g2", "bus" }; -static const char * const imx8mq_reg_names[] =3D { "g1", "g2", "ctrl" }; static const char * const imx8mq_g1_clk_names[] =3D { "g1" }; static const char * const imx8mq_g2_clk_names[] =3D { "g2" }; =20 -const struct hantro_variant imx8mq_vpu_variant =3D { - .dec_fmts =3D imx8m_vpu_dec_fmts, - .num_dec_fmts =3D ARRAY_SIZE(imx8m_vpu_dec_fmts), - .postproc_fmts =3D imx8m_vpu_postproc_fmts, - .num_postproc_fmts =3D ARRAY_SIZE(imx8m_vpu_postproc_fmts), - .postproc_ops =3D &hantro_g1_postproc_ops, - .codec =3D HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER | - HANTRO_H264_DECODER, - .codec_ops =3D imx8mq_vpu_codec_ops, - .init =3D imx8mq_vpu_hw_init, - .runtime_resume =3D imx8mq_runtime_resume, - .irqs =3D imx8mq_irqs, - .num_irqs =3D ARRAY_SIZE(imx8mq_irqs), - .clk_names =3D imx8mq_clk_names, - .num_clocks =3D ARRAY_SIZE(imx8mq_clk_names), - .reg_names =3D imx8mq_reg_names, - .num_regs =3D ARRAY_SIZE(imx8mq_reg_names) -}; - static const struct of_device_id imx8mq_vpu_shared_resources[] =3D { { .compatible =3D "nxp,imx8mq-vpu-g1", }, { .compatible =3D "nxp,imx8mq-vpu-g2", }, --=20 2.53.0 From nobody Thu Sep 24 13:01:01 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FD4E475335; Thu, 24 Sep 2026 11:08:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248119; cv=none; b=N7k3Q6b6md2OYr6hDORJp0IFAtTL4REg6uuudZm8Asy6IeC5l6HzxZ7wMtYxwJy7rtC/O+zcemfJ6mDRDHD+8+DrDqEdgZBqMs82Csci2dWIWGNIywgRYl+tMmpRL/0+yuoH5d6q1B8YX/r6gxrmNU62ERb82UOJPWFuH3unCMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248119; c=relaxed/simple; bh=f1NI3qMziuOlznqvIL1ulfZOaRPAxcYcTLJ2j9fbPcQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hk4XA2aXNuKD7JjJLHFLvdZJu7r1cZxGWWPpFHUdbFziIlXK1eivF9ZLfBWxk5jEJxCjwv7W3V6B8ktiGwkEZwR9LVqdunzJSa++qNajUBkAsF8u9gm4LHvwoH9I3+qBTvyNxSyIfxx4gioEhJiTvdvhj44sQcgy18PPuCRTfpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=OcS3be1Y; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="OcS3be1Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1790248112; bh=f1NI3qMziuOlznqvIL1ulfZOaRPAxcYcTLJ2j9fbPcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OcS3be1YIbiACfPsv66ogjTIWZxcX5iz0zBSGf60mdJxMRauXTVG706T5diEoSd/M 3nnnFTNMoPi0lkjpjplX98h1tiL+2WsbTzxx5Ukdyy5fKHEbm9iBaCASc82Px2JQVy 4fdnIpCFIARKLBDplE03n8y+BWnn9J+PQPPeyxToPsyRWV0mOoaEe9NR1NR9MaXUD/ qHAKQU2G+h56IjQ2BRLjOPkYCwI3OtG5w5+07pHUHyndZlKxCPOJRBNuHlKD7I+Fct 7AuztpxOdmrIGKQX13CEfW7fcnKEhCtFm8oYGTHpmI31wsGBi7fyKII1GGhQPYEFtr qRRtiaBp59FFg== 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 1B88A17E0A68; 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 2/3] media: dt-bindings: media: nxp, imx8mq-vpu: Remove nxp,imx8mq-vpu Date: Thu, 24 Sep 2026 13:08:24 +0200 Message-ID: <20260924110825.166238-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" nxp,imx8mq-vpu has been tagged has deprecated since a while. After driver clean up it is time to remove it. Signed-off-by: Benjamin Gaignard --- changes in v2: - have a separate patch for documentation - fix dt-bindings .../devicetree/bindings/media/nxp,imx8mq-vpu.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml b/= Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml index 19528262810a..69619d2c86fa 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml @@ -14,12 +14,10 @@ description: =20 properties: compatible: - oneOf: - - const: nxp,imx8mq-vpu - deprecated: true - - const: nxp,imx8mq-vpu-g1 - - const: nxp,imx8mq-vpu-g2 - - const: nxp,imx8mm-vpu-g1 + enum: + - nxp,imx8mq-vpu-g1 + - nxp,imx8mq-vpu-g2 + - nxp,imx8mm-vpu-g1 =20 reg: maxItems: 1 --=20 2.53.0 From nobody Thu Sep 24 13:01:01 2026 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A48CF471406; Thu, 24 Sep 2026 11:08:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248120; cv=none; b=qgyNtVVSFmQwn2b85o7iHd2OQ36w17WVwcaF8CzGXHK68SPZbFEdVkZ51srVu699aiiz0Ecgb37ZDVFLxhm3odDPCI1WbuRWy3rRKkYRR4RvjxgcJ/bjsKYXm8Kol0jobmzrFP66Gtfm/2/RFo6xZHXY6cyTjbyU4jikMes+Uzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790248120; c=relaxed/simple; bh=t7HK1oq4mCwhdhAy8SUPdPahzvOZhLavDwHLqnkVlbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=egOCpZz+n4OEONZzY7BbDvnvxWpP5dbZwrRZWhjqPXvM6F7gbd6yMSup8FrBeNZsUpfvzZ5uFvOk/GQOsvj/HSWW+JCuCOK6m4eJ+jRwQTGH0VSZZi63Tcqwv8GhtySKsKJIrIEd58eEQ5Cg2XXFPGLGrN5IyktdwIRkqx/3+Gk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=MuSc8ZUO; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="MuSc8ZUO" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/pl= atform/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/medi= a/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; =20 vpu =3D devm_kzalloc(&pdev->dev, sizeof(*vpu), GFP_KERNEL); @@ -1137,21 +1136,12 @@ static int hantro_probe(struct platform_device *pde= v) if (IS_ERR(vpu->resets)) return PTR_ERR(vpu->resets); =20 - num_bases =3D vpu->variant->num_regs ?: 1; - vpu->reg_bases =3D devm_kcalloc(&pdev->dev, num_bases, - sizeof(*vpu->reg_bases), GFP_KERNEL); - if (!vpu->reg_bases) - return -ENOMEM; + vpu->reg_base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(vpu->reg_base)) + return PTR_ERR(vpu->reg_base); =20 - for (i =3D 0; i < num_bases; i++) { - vpu->reg_bases[i] =3D vpu->variant->reg_names ? - devm_platform_ioremap_resource_byname(pdev, vpu->variant->reg_name= s[i]) : - devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(vpu->reg_bases[i])) - return PTR_ERR(vpu->reg_bases[i]); - } - vpu->enc_base =3D vpu->reg_bases[0] + vpu->variant->enc_offset; - vpu->dec_base =3D vpu->reg_bases[0] + vpu->variant->dec_offset; + vpu->enc_base =3D vpu->reg_base + vpu->variant->enc_offset; + vpu->dec_base =3D vpu->reg_base + vpu->variant->dec_offset; =20 /** * TODO: Eventually allow taking advantage of full 64-bit address space. --=20 2.53.0