From: Philipp Zabel <p.zabel@pengutronix.de>
To: Benjamin Gaignard <benjamin.gaignard@collabora.com>,
robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
festevam@gmail.com, ezequiel@collabora.com, mchehab@kernel.org,
gregkh@linuxfoundation.org
Cc: kernel@pengutronix.de, linux-imx@nxp.com,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-rockchip@lists.infradead.org, devel@driverdev.osuosl.org,
kernel@collabora.com
Subject: Re: [PATCH v3 4/5] media: hantro: Use reset driver
Date: Wed, 03 Mar 2021 15:39:32 +0100 [thread overview]
Message-ID: <29bf66f4b531ec701e85c23a411e40e3621b0ff8.camel@pengutronix.de> (raw)
In-Reply-To: <20210301151754.104749-5-benjamin.gaignard@collabora.com>
On Mon, 2021-03-01 at 16:17 +0100, Benjamin Gaignard wrote:
> Rather use a reset like feature inside the driver use the reset
> controller API to get the same result.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> ---
> drivers/staging/media/hantro/Kconfig | 1 +
> drivers/staging/media/hantro/imx8m_vpu_hw.c | 61 ++++-----------------
> 2 files changed, 12 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig
> index 5b6cf9f62b1a..dd1d4dde2658 100644
> --- a/drivers/staging/media/hantro/Kconfig
> +++ b/drivers/staging/media/hantro/Kconfig
> @@ -20,6 +20,7 @@ config VIDEO_HANTRO_IMX8M
> bool "Hantro VPU i.MX8M support"
> depends on VIDEO_HANTRO
> depends on ARCH_MXC || COMPILE_TEST
> + select RESET_VPU_IMX8MQ
> default y
> help
> Enable support for i.MX8M SoCs.
> diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c
> index c222de075ef4..d5b4312b9391 100644
> --- a/drivers/staging/media/hantro/imx8m_vpu_hw.c
> +++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c
> @@ -7,49 +7,12 @@
>
> #include <linux/clk.h>
> #include <linux/delay.h>
> +#include <linux/reset.h>
>
> #include "hantro.h"
> #include "hantro_jpeg.h"
> #include "hantro_g1_regs.h"
>
> -#define CTRL_SOFT_RESET 0x00
> -#define RESET_G1 BIT(1)
> -#define RESET_G2 BIT(0)
> -
> -#define CTRL_CLOCK_ENABLE 0x04
> -#define CLOCK_G1 BIT(1)
> -#define CLOCK_G2 BIT(0)
> -
> -#define CTRL_G1_DEC_FUSE 0x08
> -#define CTRL_G1_PP_FUSE 0x0c
> -#define CTRL_G2_DEC_FUSE 0x10
> -
> -static void imx8m_soft_reset(struct hantro_dev *vpu, u32 reset_bits)
> -{
> - u32 val;
> -
> - /* Assert */
> - val = readl(vpu->ctrl_base + CTRL_SOFT_RESET);
> - val &= ~reset_bits;
> - writel(val, vpu->ctrl_base + CTRL_SOFT_RESET);
> -
> - udelay(2);
> -
> - /* Release */
> - val = readl(vpu->ctrl_base + CTRL_SOFT_RESET);
> - val |= reset_bits;
> - writel(val, vpu->ctrl_base + CTRL_SOFT_RESET);
> -}
> -
> -static void imx8m_clk_enable(struct hantro_dev *vpu, u32 clock_bits)
> -{
> - u32 val;
> -
> - val = readl(vpu->ctrl_base + CTRL_CLOCK_ENABLE);
> - val |= clock_bits;
> - writel(val, vpu->ctrl_base + CTRL_CLOCK_ENABLE);
The way it is implemented in the reset driver, the clocks are now
ungated between assert and deassert instead of afterwards. Is this on
purpose?
regards
Philipp
next prev parent reply other threads:[~2021-03-03 18:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 15:17 [PATCH v3 0/5] Reset driver for IMX8MQ VPU hardware block Benjamin Gaignard
2021-03-01 15:17 ` [PATCH v3 1/5] dt-bindings: reset: IMX8MQ VPU reset Benjamin Gaignard
2021-03-08 18:23 ` Rob Herring
2021-03-01 15:17 ` [PATCH v3 2/5] dt-bindings: media: IMX8MQ VPU: document reset usage Benjamin Gaignard
2021-03-08 18:27 ` Rob Herring
2021-03-01 15:17 ` [PATCH v3 3/5] reset: Add reset driver for IMX8MQ VPU block Benjamin Gaignard
2021-03-03 14:33 ` Philipp Zabel
2021-03-01 15:17 ` [PATCH v3 4/5] media: hantro: Use reset driver Benjamin Gaignard
2021-03-03 14:39 ` Philipp Zabel [this message]
2021-03-03 14:48 ` Benjamin Gaignard
2021-03-01 15:17 ` [PATCH v3 5/5] arm64: dts: imx8mq: Use reset driver for VPU hardware block Benjamin Gaignard
2021-03-03 14:17 ` [PATCH v3 0/5] Reset driver for IMX8MQ " Philipp Zabel
2021-03-03 15:20 ` Benjamin Gaignard
2021-03-03 16:25 ` Philipp Zabel
2021-03-04 12:52 ` Adam Ford
2021-03-05 9:35 ` Benjamin Gaignard
2021-03-08 18:22 ` Rob Herring
2021-03-08 18:26 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=29bf66f4b531ec701e85c23a411e40e3621b0ff8.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=benjamin.gaignard@collabora.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).