From: Adam Ford <aford173@gmail.com>
To: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Cc: Ezequiel Garcia <ezequiel@collabora.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
mripard@kernel.org, paul.kocialkowski@bootlin.com,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@siol.net>,
hverkuil-cisco@xs4all.nl, emil.l.velikov@gmail.com,
Sascha Hauer <kernel@pengutronix.de>,
NXP Linux Team <linux-imx@nxp.com>,
linux-media <linux-media@vger.kernel.org>,
"open list:HANTRO VPU CODEC DRIVER"
<linux-rockchip@lists.infradead.org>,
devicetree <devicetree@vger.kernel.org>,
arm-soc <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
devel@driverdev.osuosl.org, kernel@collabora.com,
Chris Healy <cphealy@gmail.com>, Rob Herring <robh@kernel.org>
Subject: Re: [PATCH v9 02/13] dt-bindings: media: nxp, imx8mq-vpu: Update the bindings for G2 support
Date: Mon, 29 Nov 2021 14:13:41 -0600 [thread overview]
Message-ID: <CAHCN7x+HOMoVNq-swqA2p3ddGKft_8QkB2qm00-CN8Dujaw52Q@mail.gmail.com> (raw)
In-Reply-To: <20210407073534.376722-3-benjamin.gaignard@collabora.com>
On Wed, Apr 7, 2021 at 2:37 AM Benjamin Gaignard
<benjamin.gaignard@collabora.com> wrote:
>
> Introducing the G2 hevc video decoder requires modifications of the bindings to allow
> one node per VPU.
>
> VPUs share one hardware control block which is provided as a phandle on
> a syscon.
> Each node has now one reg and one interrupt.
> Add a compatible for G2 hardware block: nxp,imx8mq-vpu-g2.
>
> To be compatible with older DT the driver is still capable to use the 'ctrl'
> reg-name even if it is deprecated now.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
I need to edit the yaml file to add support the imx8mm, but it doesn't
appear that this series has gone anywhere. I know there is still some
waiting on the vpu-blk-ctrl driver, but it seems like the 8mq could
split the codecs out using syscon in place of the blk-ctrl until that
driver is available. If that doesn't work, I might have to introduce
a separate yaml file for mini which could be somehow merged with the
8mq in the future. I am just not sure which way to go right now.
adam
> ---
> version 9:
> - Corrections in commit message
>
> version 7:
> - Add Rob and Philipp reviewed-by tag
> - Change syscon phandle name to nxp,imx8m-vpu-ctrl (remove 'q' to be
> usable for iMX8MM too)
>
> version 5:
> - This version doesn't break the backward compatibilty between kernel
> and DT.
>
> .../bindings/media/nxp,imx8mq-vpu.yaml | 53 ++++++++++++-------
> 1 file changed, 34 insertions(+), 19 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> index 762be3f96ce9..18e7d40a5f24 100644
> --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
> @@ -15,22 +15,18 @@ description:
>
> properties:
> compatible:
> - const: nxp,imx8mq-vpu
> + oneOf:
> + - const: nxp,imx8mq-vpu
> + - const: nxp,imx8mq-vpu-g2
>
> reg:
> - maxItems: 3
> -
> - reg-names:
> - items:
> - - const: g1
> - - const: g2
> - - const: ctrl
> + maxItems: 1
>
> interrupts:
> - maxItems: 2
> + maxItems: 1
>
> interrupt-names:
> - items:
> + oneOf:
> - const: g1
> - const: g2
>
> @@ -46,14 +42,18 @@ properties:
> power-domains:
> maxItems: 1
>
> + nxp,imx8m-vpu-ctrl:
> + description: Specifies a phandle to syscon VPU hardware control block
> + $ref: "/schemas/types.yaml#/definitions/phandle"
> +
> required:
> - compatible
> - reg
> - - reg-names
> - interrupts
> - interrupt-names
> - clocks
> - clock-names
> + - nxp,imx8m-vpu-ctrl
>
> additionalProperties: false
>
> @@ -62,18 +62,33 @@ examples:
> #include <dt-bindings/clock/imx8mq-clock.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
>
> - vpu: video-codec@38300000 {
> + vpu_ctrl: syscon@38320000 {
> + compatible = "nxp,imx8mq-vpu-ctrl", "syscon";
> + reg = <0x38320000 0x10000>;
> + };
> +
> + vpu_g1: video-codec@38300000 {
> compatible = "nxp,imx8mq-vpu";
> - reg = <0x38300000 0x10000>,
> - <0x38310000 0x10000>,
> - <0x38320000 0x10000>;
> - reg-names = "g1", "g2", "ctrl";
> - interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
> - interrupt-names = "g1", "g2";
> + reg = <0x38300000 0x10000>;
> + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "g1";
> + clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
> + <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
> + <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
> + clock-names = "g1", "g2", "bus";
> + power-domains = <&pgc_vpu>;
> + nxp,imx8m-vpu-ctrl = <&vpu_ctrl>;
> + };
> +
> + vpu_g2: video-codec@38310000 {
> + compatible = "nxp,imx8mq-vpu-g2";
> + reg = <0x38300000 0x10000>;
> + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "g2";
> clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>,
> <&clk IMX8MQ_CLK_VPU_G2_ROOT>,
> <&clk IMX8MQ_CLK_VPU_DEC_ROOT>;
> clock-names = "g1", "g2", "bus";
> power-domains = <&pgc_vpu>;
> + nxp,imx8m-vpu-ctrl = <&vpu_ctrl>;
> };
> --
> 2.25.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-29 22:20 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 7:35 [PATCH v9 00/13] Add HANTRO G2/HEVC decoder support for IMX8MQ Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 01/13] dt-bindings: mfd: Add 'nxp,imx8mq-vpu-ctrl' to syscon list Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 02/13] dt-bindings: media: nxp,imx8mq-vpu: Update the bindings for G2 support Benjamin Gaignard
2021-11-29 20:13 ` Adam Ford [this message]
2021-11-30 12:34 ` [PATCH v9 02/13] dt-bindings: media: nxp, imx8mq-vpu: " Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 03/13] media: hantro: Use syscon instead of 'ctrl' register Benjamin Gaignard
2021-04-16 10:54 ` Lucas Stach
2021-04-16 13:08 ` Benjamin Gaignard
2021-04-16 15:14 ` Lucas Stach
2021-04-20 9:10 ` Benjamin Gaignard
2021-04-20 9:16 ` Hans Verkuil
2021-04-20 9:31 ` Benjamin Gaignard
2021-04-20 11:35 ` Hans Verkuil
2021-05-16 22:40 ` Ezequiel Garcia
2021-05-17 10:52 ` Lucas Stach
2021-05-17 13:23 ` Ezequiel Garcia
2021-05-17 13:46 ` Lucas Stach
2021-06-04 17:37 ` Ezequiel Garcia
2021-06-28 13:35 ` Benjamin Gaignard
2021-06-28 15:18 ` Ezequiel Garcia
2021-04-07 7:35 ` [PATCH v9 04/13] media: hevc: Add fields and flags for hevc PPS Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 05/13] media: hevc: Add decode params control Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 06/13] media: hantro: change hantro_codec_ops run prototype to return errors Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 07/13] media: hantro: Define HEVC codec profiles and supported features Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 08/13] media: hantro: Only use postproc when post processed formats are defined Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 09/13] media: uapi: Add a control for HANTRO driver Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 10/13] media: hantro: handle V4L2_PIX_FMT_HEVC_SLICE control Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 11/13] media: hantro: Introduce G2/HEVC decoder Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 12/13] media: hantro: IMX8M: add variant for G2/HEVC codec Benjamin Gaignard
2021-04-07 7:35 ` [PATCH v9 13/13] arm64: dts: imx8mq: Add node to G2 hardware Benjamin Gaignard
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=CAHCN7x+HOMoVNq-swqA2p3ddGKft_8QkB2qm00-CN8Dujaw52Q@mail.gmail.com \
--to=aford173@gmail.com \
--cc=benjamin.gaignard@collabora.com \
--cc=cphealy@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=ezequiel@collabora.com \
--cc=festevam@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@siol.net \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--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=mripard@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=paul.kocialkowski@bootlin.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=wens@csie.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).