| Message ID | 20211208225030.2018923-5-aford173@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | media: hantro: imx8mq/imx8mm: Let VPU decoders get controlled by vpu-blk-ctrl | expand |
On Wed, 08 Dec 2021 16:50:23 -0600, Adam Ford wrote: > The G1 and G2 are separate decoder blocks that are enabled by the > vpu-blk-ctrl power-domain controller, which now has a proper driver. > Update the bindings to support separate nodes for the G1 and G2 > decoders using the proper driver or the older unified node with > the legacy controls. > > To be compatible with older DT the driver, mark certain items as > deprecated and retain the backwards compatible example. > > Signed-off-by: Adam Ford <aford173@gmail.com> > --- > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > 1 file changed, 64 insertions(+), 19 deletions(-) > My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13): yamllint warnings/errors: dtschema/dtc warnings/errors: Error: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.example.dts:62.23-27 syntax error FATAL ERROR: Unable to parse input tree make[1]: *** [scripts/Makefile.lib:373: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.example.dt.yaml] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:1413: dt_binding_check] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/patch/1565517 This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit.
Hi, Thanks for the patch. On Wed, Dec 08, 2021 at 04:50:23PM -0600, Adam Ford wrote: > The G1 and G2 are separate decoder blocks that are enabled by the > vpu-blk-ctrl power-domain controller, which now has a proper driver. > Update the bindings to support separate nodes for the G1 and G2 > decoders using the proper driver or the older unified node with > the legacy controls. > > To be compatible with older DT the driver, mark certain items as > deprecated and retain the backwards compatible example. > > Signed-off-by: Adam Ford <aford173@gmail.com> > --- > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > 1 file changed, 64 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..eeb7bd6281f9 100644 > --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > @@ -15,29 +15,39 @@ description: > > properties: > compatible: > - const: nxp,imx8mq-vpu > + oneOf: > + - const: nxp,imx8mq-vpu > + deprecated: true > + - const: nxp,imx8mq-vpu-g1 > + - const: nxp,imx8mq-vpu-g2 > > reg: > + minItems: 1 > maxItems: 3 Is it really useful to keep the deprecated binding nxp,imx8mq-vpu as something supported by the binding file? In other words, can we drop the deprecated binding from this file, while keeping the support in the driver for legacy device-trees? [..] > + > + # VPU G1 with vpu-blk-ctrl > + - | > + #include <dt-bindings/clock/imx8mq-clock.h> > + #include <dt-bindings/power/imx8mq-power.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + vpu_g1: video-codec@38300000 { > + compatible = "nxp,imx8mq-vpu-g1"; > + reg = <0x38300000 0x10000>; > + reg-names "g1"; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "g1"; > + clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>; > + clock-names = "g1"; reg-names, interrupt-names and clock-names should be removed given for this device there's only one of each. This will make the binding actually quite easier, but it also means you need to make some changes to struct hantro_variant imx8mq_vpu_g1_variant to make it work properly. See Rob's feedback on the SAMA5 VPU binding: https://yhbt.net/lore/all/20210324151715.GA3070006@robh.at.kernel.org/ Also, take a look at drivers/staging/media/hantro/sama5d4_vdec_hw.c for reference. > + power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>; > + }; > + > + # VPU G2 with vpu-blk-ctrl > + - | > + #include <dt-bindings/clock/imx8mq-clock.h> > + #include <dt-bindings/power/imx8mq-power.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + vpu_g2: video-codec@38310000 { > + compatible = "nxp,imx8mq-vpu-g2"; > + reg = <0x38310000 0x10000>; > + reg-names "g2"; And same here. Thanks! Ezequiel
On Thu, Dec 9, 2021 at 4:26 AM Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> wrote: > > Hi, > > Thanks for the patch. > > On Wed, Dec 08, 2021 at 04:50:23PM -0600, Adam Ford wrote: > > The G1 and G2 are separate decoder blocks that are enabled by the > > vpu-blk-ctrl power-domain controller, which now has a proper driver. > > Update the bindings to support separate nodes for the G1 and G2 > > decoders using the proper driver or the older unified node with > > the legacy controls. > > > > To be compatible with older DT the driver, mark certain items as > > deprecated and retain the backwards compatible example. > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > --- > > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > > 1 file changed, 64 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..eeb7bd6281f9 100644 > > --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > @@ -15,29 +15,39 @@ description: > > > > properties: > > compatible: > > - const: nxp,imx8mq-vpu > > + oneOf: > > + - const: nxp,imx8mq-vpu > > + deprecated: true > > + - const: nxp,imx8mq-vpu-g1 > > + - const: nxp,imx8mq-vpu-g2 > > > > reg: > > + minItems: 1 > > maxItems: 3 > > Is it really useful to keep the deprecated binding nxp,imx8mq-vpu > as something supported by the binding file? Since I was told that the driver needed to be backwards compatible, i wanted to make sure that any attempts to build the old device tree would not fail > > In other words, can we drop the deprecated binding from this file, > while keeping the support in the driver for legacy device-trees? I was trying to represent both the old driver binding and the new one at the same time. I thought that's what I was told to do. > > [..] > > + > > + # VPU G1 with vpu-blk-ctrl > > + - | > > + #include <dt-bindings/clock/imx8mq-clock.h> > > + #include <dt-bindings/power/imx8mq-power.h> > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + > > + vpu_g1: video-codec@38300000 { > > + compatible = "nxp,imx8mq-vpu-g1"; > > + reg = <0x38300000 0x10000>; > > + reg-names "g1"; > > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "g1"; > > + clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>; > > + clock-names = "g1"; > > reg-names, interrupt-names and clock-names should be removed > given for this device there's only one of each. > I attempted to remove the reg-names, but it failed to enumerate for me when I did that. > This will make the binding actually quite easier, but it also > means you need to make some changes to struct hantro_variant imx8mq_vpu_g1_variant > to make it work properly. > > See Rob's feedback on the SAMA5 VPU binding: > > https://yhbt.net/lore/all/20210324151715.GA3070006@robh.at.kernel.org/ > > Also, take a look at drivers/staging/media/hantro/sama5d4_vdec_hw.c > for reference. I can try again using this as an example. > > > + power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>; > > + }; > > + > > + # VPU G2 with vpu-blk-ctrl > > + - | > > + #include <dt-bindings/clock/imx8mq-clock.h> > > + #include <dt-bindings/power/imx8mq-power.h> > > + #include <dt-bindings/interrupt-controller/arm-gic.h> > > + > > + vpu_g2: video-codec@38310000 { > > + compatible = "nxp,imx8mq-vpu-g2"; > > + reg = <0x38310000 0x10000>; > > + reg-names "g2"; > > And same here. > > Thanks! > Ezequiel
On Thu, Dec 09, 2021 at 05:36:04AM -0600, Adam Ford wrote: > On Thu, Dec 9, 2021 at 4:26 AM Ezequiel Garcia > <ezequiel@vanguardiasur.com.ar> wrote: > > > > Hi, > > > > Thanks for the patch. > > > > On Wed, Dec 08, 2021 at 04:50:23PM -0600, Adam Ford wrote: > > > The G1 and G2 are separate decoder blocks that are enabled by the > > > vpu-blk-ctrl power-domain controller, which now has a proper driver. > > > Update the bindings to support separate nodes for the G1 and G2 > > > decoders using the proper driver or the older unified node with > > > the legacy controls. > > > > > > To be compatible with older DT the driver, mark certain items as > > > deprecated and retain the backwards compatible example. > > > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > > --- > > > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > > > 1 file changed, 64 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..eeb7bd6281f9 100644 > > > --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > @@ -15,29 +15,39 @@ description: > > > > > > properties: > > > compatible: > > > - const: nxp,imx8mq-vpu > > > + oneOf: > > > + - const: nxp,imx8mq-vpu > > > + deprecated: true > > > + - const: nxp,imx8mq-vpu-g1 > > > + - const: nxp,imx8mq-vpu-g2 > > > > > > reg: > > > + minItems: 1 > > > maxItems: 3 > > > > Is it really useful to keep the deprecated binding nxp,imx8mq-vpu > > as something supported by the binding file? > > Since I was told that the driver needed to be backwards compatible, i > wanted to make sure that any attempts to build the old device tree > would not fail I'm not convinced changing the binding at all is correct. 'The driver structure is changing and I want the binding to align with it' is not a reason. Are G1 and G2 actually separate, independent blocks where we could have 1 or both of them? And what about other platforms using this block? Even if the driver handles the old binding, a new dtb with an old kernel is broken. It's up to the platform to care or not, but you have to highlight that. > > In other words, can we drop the deprecated binding from this file, > > while keeping the support in the driver for legacy device-trees? > > I was trying to represent both the old driver binding and the new one > at the same time. I thought that's what I was told to do. I don't care so much if we have a schema for old binding. I'd rather have warnings if the binding has not been updated. Eventually I want to be able to test for compatibility by testing DTs with different schema versions. We've got to get to 0 warnings first though... Rob
Am Freitag, dem 10.12.2021 um 09:36 -0600 schrieb Rob Herring: > On Thu, Dec 09, 2021 at 05:36:04AM -0600, Adam Ford wrote: > > On Thu, Dec 9, 2021 at 4:26 AM Ezequiel Garcia > > <ezequiel@vanguardiasur.com.ar> wrote: > > > > > > Hi, > > > > > > Thanks for the patch. > > > > > > On Wed, Dec 08, 2021 at 04:50:23PM -0600, Adam Ford wrote: > > > > The G1 and G2 are separate decoder blocks that are enabled by the > > > > vpu-blk-ctrl power-domain controller, which now has a proper driver. > > > > Update the bindings to support separate nodes for the G1 and G2 > > > > decoders using the proper driver or the older unified node with > > > > the legacy controls. > > > > > > > > To be compatible with older DT the driver, mark certain items as > > > > deprecated and retain the backwards compatible example. > > > > > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > > > --- > > > > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > > > > 1 file changed, 64 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..eeb7bd6281f9 100644 > > > > --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > > +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > > @@ -15,29 +15,39 @@ description: > > > > > > > > properties: > > > > compatible: > > > > - const: nxp,imx8mq-vpu > > > > + oneOf: > > > > + - const: nxp,imx8mq-vpu > > > > + deprecated: true > > > > + - const: nxp,imx8mq-vpu-g1 > > > > + - const: nxp,imx8mq-vpu-g2 > > > > > > > > reg: > > > > + minItems: 1 > > > > maxItems: 3 > > > > > > Is it really useful to keep the deprecated binding nxp,imx8mq-vpu > > > as something supported by the binding file? > > > > Since I was told that the driver needed to be backwards compatible, i > > wanted to make sure that any attempts to build the old device tree > > would not fail > > I'm not convinced changing the binding at all is correct. 'The driver > structure is changing and I want the binding to align with it' is not a > reason. Are G1 and G2 actually separate, independent blocks where we > could have 1 or both of them? And what about other platforms using this > block? Yes, they are totally independent video decoder peripherals, handling different codecs. While I'm not aware that there is a SKU that only uses one of them, there is a provision in the fuses to disable either one of the VPU peripherals, so they clearly can work independently. Smashing them together in one DT node was a mistake IMO. Both VPUs do not share more than a common power-domain and use the same AMBA domain bridge to hook into to SoC NoC. On the i.MX8M Mini we have a similar VPU subsystem, but with nested power domains, so G1, G2 and the new H1 encoder on this chip can even be powered-gated individually. I agree that the commit message should point out that new DT + old kernel is not a supported configuration. It isn't optimal, but IMHO a small price to pay for the ability to handle all the i.MX8M* family VPU subsystems in the same way with a proper blk-ctrl driver for the common clock and reset block and the VPUs being independent peripherals. > > Even if the driver handles the old binding, a new dtb with an old kernel > is broken. It's up to the platform to care or not, but you have to > highlight that. > > > > > In other words, can we drop the deprecated binding from this file, > > > while keeping the support in the driver for legacy device-trees? > > > > I was trying to represent both the old driver binding and the new one > > at the same time. I thought that's what I was told to do. > > I don't care so much if we have a schema for old binding. I'd rather > have warnings if the binding has not been updated. Eventually I want to > be able to test for compatibility by testing DTs with different schema > versions. We've got to get to 0 warnings first though... I'm in favor of dropping the old binding from the schema. New DTs should clearly use the new binding and old DTs shouldn't change anymore, so validation is less useful there. Regards, Lucas
On Fri, Dec 10, 2021 at 9:58 AM Lucas Stach <l.stach@pengutronix.de> wrote: > > Am Freitag, dem 10.12.2021 um 09:36 -0600 schrieb Rob Herring: > > On Thu, Dec 09, 2021 at 05:36:04AM -0600, Adam Ford wrote: > > > On Thu, Dec 9, 2021 at 4:26 AM Ezequiel Garcia > > > <ezequiel@vanguardiasur.com.ar> wrote: > > > > > > > > Hi, > > > > > > > > Thanks for the patch. > > > > > > > > On Wed, Dec 08, 2021 at 04:50:23PM -0600, Adam Ford wrote: > > > > > The G1 and G2 are separate decoder blocks that are enabled by the > > > > > vpu-blk-ctrl power-domain controller, which now has a proper driver. > > > > > Update the bindings to support separate nodes for the G1 and G2 > > > > > decoders using the proper driver or the older unified node with > > > > > the legacy controls. > > > > > > > > > > To be compatible with older DT the driver, mark certain items as > > > > > deprecated and retain the backwards compatible example. > > > > > > > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > > > > --- > > > > > .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- > > > > > 1 file changed, 64 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..eeb7bd6281f9 100644 > > > > > --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > > > +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml > > > > > @@ -15,29 +15,39 @@ description: > > > > > > > > > > properties: > > > > > compatible: > > > > > - const: nxp,imx8mq-vpu > > > > > + oneOf: > > > > > + - const: nxp,imx8mq-vpu > > > > > + deprecated: true > > > > > + - const: nxp,imx8mq-vpu-g1 > > > > > + - const: nxp,imx8mq-vpu-g2 > > > > > > > > > > reg: > > > > > + minItems: 1 > > > > > maxItems: 3 > > > > > > > > Is it really useful to keep the deprecated binding nxp,imx8mq-vpu > > > > as something supported by the binding file? > > > > > > Since I was told that the driver needed to be backwards compatible, i > > > wanted to make sure that any attempts to build the old device tree > > > would not fail > > > > I'm not convinced changing the binding at all is correct. 'The driver > > structure is changing and I want the binding to align with it' is not a > > reason. Are G1 and G2 actually separate, independent blocks where we > > could have 1 or both of them? And what about other platforms using this > > block? > > Yes, they are totally independent video decoder peripherals, handling > different codecs. While I'm not aware that there is a SKU that only > uses one of them, there is a provision in the fuses to disable either > one of the VPU peripherals, so they clearly can work independently. > > Smashing them together in one DT node was a mistake IMO. Both VPUs do > not share more than a common power-domain and use the same AMBA domain > bridge to hook into to SoC NoC. On the i.MX8M Mini we have a similar > VPU subsystem, but with nested power domains, so G1, G2 and the new H1 > encoder on this chip can even be powered-gated individually. > > I agree that the commit message should point out that new DT + old > kernel is not a supported configuration. It isn't optimal, but IMHO a > small price to pay for the ability to handle all the i.MX8M* family VPU > subsystems in the same way with a proper blk-ctrl driver for the common > clock and reset block and the VPUs being independent peripherals. > > > > > Even if the driver handles the old binding, a new dtb with an old kernel > > is broken. It's up to the platform to care or not, but you have to > > highlight that. > > > > > > > > In other words, can we drop the deprecated binding from this file, > > > > while keeping the support in the driver for legacy device-trees? > > > > > > I was trying to represent both the old driver binding and the new one > > > at the same time. I thought that's what I was told to do. > > > > I don't care so much if we have a schema for old binding. I'd rather > > have warnings if the binding has not been updated. Eventually I want to > > be able to test for compatibility by testing DTs with different schema > > versions. We've got to get to 0 warnings first though... > > I'm in favor of dropping the old binding from the schema. New DTs > should clearly use the new binding and old DTs shouldn't change > anymore, so validation is less useful there. I wonder if it makes sense to have a more standardized hantro schema for all the users instead of one dedicated to each platform using a hantro driver. The unified schema could have all the various compatible flags so the driver still knows which features are enabled/disabled and it's very clear who all the users are for it. I would think it could cover both the encoder and decoder variants as well. We do something similar for 8250 serial ports. If so, can someone from the media group suggest the best one to follow? Ezequiel suggested I look at the sama5d4-vdec to help reduce some clutter in the driver. If that binding is good enough, should I just add the compatible flags to that and potentially rename it. adam > > Regards, > Lucas >
> > > > I'm in favor of dropping the old binding from the schema. New DTs > > should clearly use the new binding and old DTs shouldn't change > > anymore, so validation is less useful there. > > I wonder if it makes sense to have a more standardized hantro schema > for all the users instead of one dedicated to each platform using a > hantro driver. The unified schema could have all the various > compatible flags so the driver still knows which features are > enabled/disabled and it's very clear who all the users are for it. I > would think it could cover both the encoder and decoder variants as > well. We do something similar for 8250 serial ports. > > If so, can someone from the media group suggest the best one to > follow? Ezequiel suggested I look at the sama5d4-vdec to help reduce > some clutter in the driver. If that binding is good enough, should I > just add the compatible flags to that and potentially rename it. > A unified schema might sound elegant and compelling, but I suspect it can bite us down the road, due to differences in the platform integration. Seems we are all on-board going forward with a patch similar to this one, but also dropping the deprecated binding from the schema (while of course still supporting old DTBs on new kernels). Rob's suggestion about having a warning in the platform if the binding has not been updated, sounds like very useful too. Keep in mind v5.16-rc5 is near, which means we still have a few weeks to discuss this patch, until the next linux-media merge season. Thanks, Ezequiel
diff --git a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml index 762be3f96ce9..eeb7bd6281f9 100644 --- a/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml +++ b/Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml @@ -15,29 +15,39 @@ description: properties: compatible: - const: nxp,imx8mq-vpu + oneOf: + - const: nxp,imx8mq-vpu + deprecated: true + - const: nxp,imx8mq-vpu-g1 + - const: nxp,imx8mq-vpu-g2 reg: + minItems: 1 maxItems: 3 reg-names: + minItems: 1 items: - const: g1 - const: g2 - const: ctrl interrupts: + minItems: 1 maxItems: 2 interrupt-names: + minItems: 1 items: - const: g1 - const: g2 clocks: + minItems: 1 maxItems: 3 clock-names: + minItems: 1 items: - const: g1 - const: g2 @@ -58,22 +68,57 @@ required: additionalProperties: false examples: + # Device node example backwards compatibility - | - #include <dt-bindings/clock/imx8mq-clock.h> - #include <dt-bindings/interrupt-controller/arm-gic.h> - - vpu: 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"; - 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>; - }; + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + vpu: 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"; + 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>; + }; + + # VPU G1 with vpu-blk-ctrl + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/power/imx8mq-power.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + vpu_g1: video-codec@38300000 { + compatible = "nxp,imx8mq-vpu-g1"; + reg = <0x38300000 0x10000>; + reg-names "g1"; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "g1"; + clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>; + clock-names = "g1"; + power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>; + }; + + # VPU G2 with vpu-blk-ctrl + - | + #include <dt-bindings/clock/imx8mq-clock.h> + #include <dt-bindings/power/imx8mq-power.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + + vpu_g2: video-codec@38310000 { + compatible = "nxp,imx8mq-vpu-g2"; + reg = <0x38310000 0x10000>; + reg-names "g2"; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "g2"; + clocks = <&clk IMX8MQ_CLK_VPU_G2_ROOT>; + clock-names = "g2"; + power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G2>; + };
The G1 and G2 are separate decoder blocks that are enabled by the vpu-blk-ctrl power-domain controller, which now has a proper driver. Update the bindings to support separate nodes for the G1 and G2 decoders using the proper driver or the older unified node with the legacy controls. To be compatible with older DT the driver, mark certain items as deprecated and retain the backwards compatible example. Signed-off-by: Adam Ford <aford173@gmail.com> --- .../bindings/media/nxp,imx8mq-vpu.yaml | 83 ++++++++++++++----- 1 file changed, 64 insertions(+), 19 deletions(-)