> -----Original Message----- > From: Nicolas Dufresne [mailto:nicolas@xxxxxxxxxxxx] > Sent: Wednesday, September 22, 2021 8:55 PM > To: Ming Qian <ming.qian@xxxxxxx>; mchehab@xxxxxxxxxx; > shawnguo@xxxxxxxxxx; robh+dt@xxxxxxxxxx; s.hauer@xxxxxxxxxxxxxx > Cc: hverkuil-cisco@xxxxxxxxx; kernel@xxxxxxxxxxxxxx; festevam@xxxxxxxxx; > dl-linux-imx <linux-imx@xxxxxxx>; Aisheng Dong <aisheng.dong@xxxxxxx>; > linux-media@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; > devicetree@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Subject: [EXT] Re: [PATCH v9 11/13] ARM64: dts: freescale: imx8q: add imx vpu > codec entries > > Caution: EXT Email > > Hi Ming, > > Le lundi 13 septembre 2021 à 17:11 +0800, Ming Qian a écrit : > > Add the Video Processing Unit node for IMX8Q SoC. > > Just to let you know that this patch no longer apply on 5.15-rc2. Please let us > know which was your base. Hi Nicolas, The base commit I used is 9c3a0f285248899dfa81585bc5d5bc9ebdb8fead. It's recorded in the conver > > > > > Signed-off-by: Ming Qian <ming.qian@xxxxxxx> > > Signed-off-by: Shijie Qin <shijie.qin@xxxxxxx> > > Signed-off-by: Zhou Peng <eagle.zhou@xxxxxxx> > > --- > > .../arm64/boot/dts/freescale/imx8-ss-vpu.dtsi | 72 > > +++++++++++++++++++ arch/arm64/boot/dts/freescale/imx8qxp-mek.dts > | 17 +++++ > > arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 24 +++++++ > > 3 files changed, 113 insertions(+) > > create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi > > b/arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi > > new file mode 100644 > > index 000000000000..f2dde6d14ca3 > > --- /dev/null > > +++ b/arch/arm64/boot/dts/freescale/imx8-ss-vpu.dtsi > > @@ -0,0 +1,72 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright 2021 NXP > > + * Dong Aisheng <aisheng.dong@xxxxxxx> > > + */ > > + > > +vpu: vpu@2c000000 { > > + #address-cells = <1>; > > + #size-cells = <1>; > > + ranges = <0x2c000000 0x0 0x2c000000 0x2000000>; > > + reg = <0 0x2c000000 0 0x1000000>; > > + power-domains = <&pd IMX_SC_R_VPU>; > > + status = "disabled"; > > + > > + mu_m0: mailbox@2d000000 { > > + compatible = "fsl,imx6sx-mu"; > > + reg = <0x2d000000 0x20000>; > > + interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>; > > + #mbox-cells = <2>; > > + power-domains = <&pd IMX_SC_R_VPU_MU_0>; > > + status = "okay"; > > + }; > > + > > + mu1_m0: mailbox@2d020000 { > > + compatible = "fsl,imx6sx-mu"; > > + reg = <0x2d020000 0x20000>; > > + interrupts = <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>; > > + #mbox-cells = <2>; > > + power-domains = <&pd IMX_SC_R_VPU_MU_1>; > > + status = "okay"; > > + }; > > + > > + mu2_m0: mailbox@2d040000 { > > + compatible = "fsl,imx6sx-mu"; > > + reg = <0x2d040000 0x20000>; > > + interrupts = <GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>; > > + #mbox-cells = <2>; > > + power-domains = <&pd IMX_SC_R_VPU_MU_2>; > > + status = "disabled"; > > + }; > > + > > + vpu_core0: vpu_core@2d080000 { > > + reg = <0x2d080000 0x10000>; > > + compatible = "nxp,imx8q-vpu-decoder"; > > + power-domains = <&pd IMX_SC_R_VPU_DEC_0>; > > + mbox-names = "tx0", "tx1", "rx"; > > + mboxes = <&mu_m0 0 0>, > > + <&mu_m0 0 1>, > > + <&mu_m0 1 0>; > > + status = "disabled"; > > + }; > > + vpu_core1: vpu_core@2d090000 { > > + reg = <0x2d090000 0x10000>; > > + compatible = "nxp,imx8q-vpu-encoder"; > > + power-domains = <&pd IMX_SC_R_VPU_ENC_0>; > > + mbox-names = "tx0", "tx1", "rx"; > > + mboxes = <&mu1_m0 0 0>, > > + <&mu1_m0 0 1>, > > + <&mu1_m0 1 0>; > > + status = "disabled"; > > + }; > > + vpu_core2: vpu_core@2d0a0000 { > > + reg = <0x2d0a0000 0x10000>; > > + compatible = "nxp,imx8q-vpu-encoder"; > > + power-domains = <&pd IMX_SC_R_VPU_ENC_1>; > > + mbox-names = "tx0", "tx1", "rx"; > > + mboxes = <&mu2_m0 0 0>, > > + <&mu2_m0 0 1>, > > + <&mu2_m0 1 0>; > > + status = "disabled"; > > + }; > > +}; > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts > > b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts > > index 863232a47004..05495b60beb8 100644 > > --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts > > @@ -196,6 +196,23 @@ &usdhc2 { > > status = "okay"; > > }; > > > > +&vpu { > > + compatible = "nxp,imx8qxp-vpu"; > > + status = "okay"; > > +}; > > + > > +&vpu_core0 { > > + reg = <0x2d040000 0x10000>; > > + memory-region = <&decoder_boot>, <&decoder_rpc>; > > + status = "okay"; > > +}; > > + > > +&vpu_core1 { > > + reg = <0x2d050000 0x10000>; > > + memory-region = <&encoder_boot>, <&encoder_rpc>; > > + status = "okay"; > > +}; > > + > > &iomuxc { > > pinctrl_fec1: fec1grp { > > fsl,pins = < > > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi > > b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi > > index 1e6b4995091e..6b421cfa5534 100644 > > --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi > > +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi > > @@ -46,6 +46,9 @@ aliases { > > serial1 = &lpuart1; > > serial2 = &lpuart2; > > serial3 = &lpuart3; > > + vpu_core0 = &vpu_core0; > > + vpu_core1 = &vpu_core1; > > + vpu_core2 = &vpu_core2; > > }; > > > > cpus { > > @@ -134,10 +137,30 @@ reserved-memory { > > #size-cells = <2>; > > ranges; > > > > + decoder_boot: decoder-boot@84000000 { > > + reg = <0 0x84000000 0 0x2000000>; > > + no-map; > > + }; > > + > > + encoder_boot: encoder-boot@86000000 { > > + reg = <0 0x86000000 0 0x200000>; > > + no-map; > > + }; > > + > > + decoder_rpc: decoder-rpc@0x92000000 { > > + reg = <0 0x92000000 0 0x100000>; > > + no-map; > > + }; > > + > > dsp_reserved: dsp@92400000 { > > reg = <0 0x92400000 0 0x2000000>; > > no-map; > > }; > > + > > + encoder_rpc: encoder-rpc@0x94400000 { > > + reg = <0 0x94400000 0 0x700000>; > > + no-map; > > + }; > > }; > > > > pmu { > > @@ -258,6 +281,7 @@ map0 { > > }; > > > > /* sorted in register address */ > > + #include "imx8-ss-vpu.dtsi" > > #include "imx8-ss-adma.dtsi" > > #include "imx8-ss-conn.dtsi" > > #include "imx8-ss-ddr.dtsi" >
