Skip to contentSkip to conversation

arm64: dts: imx8mp: Add Hantro G1, G2 DT nodes

PATCH Superseded Marek Vasut 3 participants 5 messages Dec 18, 2022 – Dec 20, 2022

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm64: dts: imx8mp: Add Hantro G1, G2 DT nodes

Add DT nodes for the Hantro VPU found in i.MX8MP SoC.

---
Cc: Abel Vesa <[email protected]>
Cc: Adam Ford <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Markus Niebel <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Richard Zhu <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
To: [email protected]
---
V2: Drop the VC8000E

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +25 -0
index 34c2c80c47eb5..d472170ee9ff1 100644
@@ -1639,6 +1639,28 @@ gpu2d: gpu@38008000 {
 			power-domains = <&pgc_gpu2d>;
 		};
 
+		vpu_g1: video-codec@38300000 {
+			compatible = "nxp,imx8mm-vpu-g1";
+			reg = <0x38300000 0x10000>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G1>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G1>;
+		};
+
+		vpu_g2: video-codec@38310000 {
+			compatible = "nxp,imx8mq-vpu-g2";
+			reg = <0x38310000 0x10000>;
+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G2_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G2>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G2>;
+		};
+
 		vpumix_blk_ctrl: blk-ctrl@38330000 {
 			compatible = "fsl,imx8mp-vpu-blk-ctrl", "syscon";
 			reg = <0x38330000 0x100>;
@@ -1650,6 +1672,9 @@ vpumix_blk_ctrl: blk-ctrl@38330000 {
 				 <&clk IMX8MP_CLK_VPU_G2_ROOT>,
 				 <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>;
 			clock-names = "g1", "g2", "vc8000e";
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_BUS>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;
 			interconnects = <&noc IMX8MP_ICM_VPU_G1 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_G2 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_H1 &noc IMX8MP_ICN_VIDEO>;
Signature · 7 lines
2.35.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v2 1/1
#1 lore raw

Hi Marek,

Thank you for the patch.

Quoted 64 lines · Marek Vasut

Add DT nodes for the Hantro VPU found in i.MX8MP SoC.

---
Cc: Abel Vesa <[email protected]>
Cc: Adam Ford <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Markus Niebel <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Richard Zhu <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
To: [email protected]
---
V2: Drop the VC8000E

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +22 -0
index 34c2c80c47eb5..d472170ee9ff1 100644
@@ -1639,6 +1639,28 @@ gpu2d: gpu@38008000 {
 			power-domains = <&pgc_gpu2d>;
 		};
 
+		vpu_g1: video-codec@38300000 {
+			compatible = "nxp,imx8mm-vpu-g1";
+			reg = <0x38300000 0x10000>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G1>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G1>;
+		};
+
+		vpu_g2: video-codec@38310000 {
+			compatible = "nxp,imx8mq-vpu-g2";
+			reg = <0x38310000 0x10000>;
+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G2_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G2>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G2>;
+		};
+
 		vpumix_blk_ctrl: blk-ctrl@38330000 {
 			compatible = "fsl,imx8mp-vpu-blk-ctrl", "syscon";
 			reg = <0x38330000 0x100>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi vpumix_blk_ctrl: blk-ctrl@38330000 { · line 1677

Quoted 6 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +3 -0
@@ -1650,6 +1672,9 @@ vpumix_blk_ctrl: blk-ctrl@38330000 {
 				 <&clk IMX8MP_CLK_VPU_G2_ROOT>,
 				 <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>;
 			clock-names = "g1", "g2", "vc8000e";
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_BUS>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

Those three assigned-clock-rates all configure the same IMX8MP_VPU_PLL clock. It's a bit redundant, and maybe we could instead configure IMX8MP_VPU_PLL explicitly. This being said, I'm fine with this patch as-is.

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 			interconnects = <&noc IMX8MP_ICM_VPU_G1 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_G2 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_H1 &noc IMX8MP_ICN_VIDEO>;
Signature · 8 lines
Regards,

Laurent Pinchart

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw
In reply to Marek Vasut

Am Sonntag, dem 18.12.2022 um 05:20 +0100 schrieb Marek Vasut:

Quoted 36 lines

Add DT nodes for the Hantro VPU found in i.MX8MP SoC.

---
Cc: Abel Vesa <[email protected]>
Cc: Adam Ford <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Markus Niebel <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Richard Zhu <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
To: [email protected]
---
V2: Drop the VC8000E

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index 34c2c80c47eb5..d472170ee9ff1 100644
@@ -1639,6 +1639,28 @@ gpu2d: gpu@38008000 {
 			power-domains = <&pgc_gpu2d>;

arch/arm64/boot/dts/freescale/imx8mp.dtsi gpu2d: gpu@38008000 { · line 1649

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
 		};
 
+		vpu_g1: video-codec@38300000 {
+			compatible = "nxp,imx8mm-vpu-g1";
+			reg = <0x38300000 0x10000>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G1>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

Where does this clock rate come from? G1 nominal rate is 600MHz, overdrive rate is 800MHz. The general convention is to put the nominal rate into the assigned clocks. Overdrive rates need proper OPP support in the drivers and is not generally enabled right now.

arch/arm64/boot/dts/freescale/imx8mp.dtsi gpu2d: gpu@38008000 { · line 1660

Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +11 -0
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G1>;
+		};
+
+		vpu_g2: video-codec@38310000 {
+			compatible = "nxp,imx8mq-vpu-g2";
+			reg = <0x38310000 0x10000>;
+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G2_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G2>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

Same comment as above G2 nominal rate is 500MHz. You might want to source this from SYS_PLL2, instead of the VPU PLL.

Regards,
Lucas

arch/arm64/boot/dts/freescale/imx8mp.dtsi vpumix_blk_ctrl: blk-ctrl@38330000 { · line 1677

Quoted 13 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +6 -0
+			power-domains = <&vpumix_blk_ctrl IMX8MP_VPUBLK_PD_G2>;
+		};
+
 		vpumix_blk_ctrl: blk-ctrl@38330000 {
 			compatible = "fsl,imx8mp-vpu-blk-ctrl", "syscon";
 			reg = <0x38330000 0x100>;
@@ -1650,6 +1672,9 @@ vpumix_blk_ctrl: blk-ctrl@38330000 {
 				 <&clk IMX8MP_CLK_VPU_G2_ROOT>,
 				 <&clk IMX8MP_CLK_VPU_VC8KE_ROOT>;
 			clock-names = "g1", "g2", "vc8000e";
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_BUS>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

VPU_BUS is the parent of VPU_ROOT and should be assigned in the pgc_vpumix node, where it is used. Again nominal clock frequency 600MHz. But then maybe it would make sense to limit this to 500MHz for now to be able to source it from a system PLL.

Regards,
Lucas

arch/arm64/boot/dts/freescale/imx8mp.dtsi vpumix_blk_ctrl: blk-ctrl@38330000 { · line 1680

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
 			interconnects = <&noc IMX8MP_ICM_VPU_G1 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_G2 &noc IMX8MP_ICN_VIDEO>,
 					<&noc IMX8MP_ICM_VPU_H1 &noc IMX8MP_ICN_VIDEO>;

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw
Quoted 39 lines · Lucas Stach

Am Sonntag, dem 18.12.2022 um 05:20 +0100 schrieb Marek Vasut:

Quoted 38 lines

Add DT nodes for the Hantro VPU found in i.MX8MP SoC.

---
Cc: Abel Vesa <[email protected]>
Cc: Adam Ford <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Markus Niebel <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Richard Zhu <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
To: [email protected]
---
V2: Drop the VC8000E

---
  arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +++++++++++++++++++++++
  1 file changed, 25 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index 34c2c80c47eb5..d472170ee9ff1 100644
@@ -1639,6 +1639,28 @@ gpu2d: gpu@38008000 {
  			power-domains = <&pgc_gpu2d>;
  		};
 
Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi gpu2d: gpu@38008000 { · line 1649

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
+		vpu_g1: video-codec@38300000 {
+			compatible = "nxp,imx8mm-vpu-g1";
+			reg = <0x38300000 0x10000>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G1>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

Where does this clock rate come from? G1 nominal rate is 600MHz,

NXP downstream, see:

https://source.codeaurora.org/external/imx/linux-imx/tree/arch/arm64/boot/dts/freescale/imx8mp.dtsi?h=lf-5.15.y#n2231

[...]

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

Am Montag, dem 19.12.2022 um 20:15 +0100 schrieb Marek Vasut:

Quoted 51 lines · Lucas Stach
Quoted 39 lines

Am Sonntag, dem 18.12.2022 um 05:20 +0100 schrieb Marek Vasut:

Quoted 38 lines

Add DT nodes for the Hantro VPU found in i.MX8MP SoC.

---
Cc: Abel Vesa <[email protected]>
Cc: Adam Ford <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Ezequiel Garcia <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Markus Niebel <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Richard Zhu <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
To: [email protected]
---
V2: Drop the VC8000E

---
  arch/arm64/boot/dts/freescale/imx8mp.dtsi | 25 +++++++++++++++++++++++
  1 file changed, 25 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +0 -0
index 34c2c80c47eb5..d472170ee9ff1 100644
@@ -1639,6 +1639,28 @@ gpu2d: gpu@38008000 {
  			power-domains = <&pgc_gpu2d>;
  		};
 
Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mp.dtsi gpu2d: gpu@38008000 { · line 1649

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp.dtsi +8 -0
+		vpu_g1: video-codec@38300000 {
+			compatible = "nxp,imx8mm-vpu-g1";
+			reg = <0x38300000 0x10000>;
+			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&clk IMX8MP_CLK_VPU_G1_ROOT>;
+			assigned-clocks = <&clk IMX8MP_CLK_VPU_G1>;
+			assigned-clock-parents = <&clk IMX8MP_VPU_PLL_OUT>;
+			assigned-clock-rates = <700000000>;

Where does this clock rate come from? G1 nominal rate is 600MHz,

Quoted 3 lines

NXP downstream, see:

https://source.codeaurora.org/external/imx/linux-imx/tree/arch/arm64/boot/dts/freescale/imx8mp.dtsi?h=lf-5.15.y#n2231

Nope, as you can see, downstream is running all clocks at the overdrive
rates: G1 at 800MHz, G2 at 700MHz, bus at 800MHz. That is quite different from all 3 clocks at 700MHz from your patch.

Regards,
Lucas

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel