Re: [PATCH] arm64: dts: imx8mm: add pgc/blk_ctl nodes
From: Adam Ford <hidden>
Date: 2021-06-29 13:36:44
Also in:
linux-arm-kernel, lkml
On Fri, Jun 4, 2021 at 5:37 AM Peng Fan (OSS) [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Peng Fan <peng.fan@nxp.com> With PGC and BLK-CTL landed, we could add pgc and blk-ctl nodes, because some pgc domain relies on blk-ctl power domain, so they need to be added together. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- V1: Depends on the blk-ctl patchset, https://patchwork.kernel.org/project/linux-arm-kernel/cover/20210522134249.15322-1-peng.fan@oss.nxp.com/ Shawn, Since the blk-ctl patchset is in good shape and tested, is it ok for you to pick up? Thanks arch/arm64/boot/dts/freescale/imx8mm.dtsi | 128 ++++++++++++++++++++++ 1 file changed, 128 insertions(+)diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index e7648c3b8390..0e01ff649956 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi@@ -7,6 +7,8 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/power/imx8mm-power.h> +#include <dt-bindings/reset/imx8mq-reset.h> #include <dt-bindings/thermal/thermal.h> #include "imx8mm-pinfunc.h"@@ -609,6 +611,109 @@ src: reset-controller@30390000 { interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; #reset-cells = <1>; }; + + gpc: gpc@303a0000 { + compatible = "fsl,imx8mm-gpc"; + reg = <0x303a0000 0x10000>; + interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>; + interrupt-parent = <&gic>; + interrupt-controller; + #interrupt-cells = <3>; + + pgc { + #address-cells = <1>; + #size-cells = <0>; + + pgc_hsiomix: power-domain@0 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_HSIOMIX>; + clocks = <&clk IMX8MM_CLK_USB1_CTRL_ROOT>; + }; + + pgc_pcie: power-domain@1 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_PCIE>; + power-domains = <&pgc_hsiomix>; + clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>; + }; + + pgc_otg1: power-domain@2 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_OTG1>; + power-domains = <&pgc_hsiomix>; + }; + + pgc_otg2: power-domain@3 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_OTG2>; + power-domains = <&pgc_hsiomix>; + }; +
Any change you could add the references to pgc_otg1 and pgc_otg2 to their respective OTG nodes? Without them, enabling OTG1 or OTG2 can result in a hang unless it was started in U-Boot.
quoted hunk ↗ jump to hunk
+ pgc_gpumix: power-domain@4 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_GPUMIX>; + clocks = <&clk IMX8MM_CLK_GPU_BUS_ROOT>, + <&clk IMX8MM_CLK_GPU_AHB>; + }; + + pgc_gpu: power-domain@5 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_GPU>; + clocks = <&clk IMX8MM_CLK_GPU_AHB>, + <&clk IMX8MM_CLK_GPU_BUS_ROOT>, + <&clk IMX8MM_CLK_GPU2D_ROOT>, + <&clk IMX8MM_CLK_GPU3D_ROOT>; + resets = <&src IMX8MQ_RESET_GPU_RESET>; + power-domains = <&pgc_gpumix>; + }; + + pgc_vpumix: power-domain@6 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_VPUMIX>; + clocks = <&clk IMX8MM_CLK_VPU_DEC_ROOT>; + resets = <&src IMX8MQ_RESET_VPU_RESET>; + }; + + pgc_vpu_g1: power-domain@7 { + #power-domain-cells = <0>; + power-domains = + <&vpumix_blk_ctl IMX8MM_BLK_CTL_PD_VPU_BUS>; + reg = <IMX8MM_POWER_DOMAIN_VPUG1>; + clocks = <&clk IMX8MM_CLK_VPU_G1_ROOT>; + }; + + pgc_vpu_g2: power-domain@8 { + #power-domain-cells = <0>; + power-domains = + <&vpumix_blk_ctl IMX8MM_BLK_CTL_PD_VPU_BUS>; + reg = <IMX8MM_POWER_DOMAIN_VPUG2>; + clocks = <&clk IMX8MM_CLK_VPU_G2_ROOT>; + }; + + pgc_vpu_h1: power-domain@9 { + #power-domain-cells = <0>; + power-domains = + <&vpumix_blk_ctl IMX8MM_BLK_CTL_PD_VPU_BUS>; + reg = <IMX8MM_POWER_DOMAIN_VPUH1>; + clocks = <&clk IMX8MM_CLK_VPU_H1_ROOT>; + }; + + pgc_dispmix: power-domain@10 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_DISPMIX>; + clocks = <&clk IMX8MM_CLK_DISP_ROOT>, + <&clk IMX8MM_CLK_DISP_AXI_ROOT>, + <&clk IMX8MM_CLK_DISP_APB_ROOT>; + }; + + pgc_mipi: power-domain@11 { + #power-domain-cells = <0>; + reg = <IMX8MM_POWER_DOMAIN_MIPI>; + power-domains = + <&dispmix_blk_ctl IMX8MM_BLK_CTL_PD_DISPMIX_BUS>; + }; + }; + }; }; aips2: bus@30400000 {@@ -960,6 +1065,18 @@ aips4: bus@32c00000 { #size-cells = <1>; ranges = <0x32c00000 0x32c00000 0x400000>; + dispmix_blk_ctl: blk_ctl@32e28000 { + compatible = "fsl,imx8mm-dispmix-blk-ctl", "syscon"; + reg = <0x32e28000 0x100>; + #power-domain-cells = <1>; + #reset-cells = <1>; + power-domains = <&pgc_dispmix>, <&pgc_mipi>; + power-domain-names = "dispmix", "mipi"; + clocks = <&clk IMX8MM_CLK_DISP_ROOT>, + <&clk IMX8MM_CLK_DISP_AXI_ROOT>, + <&clk IMX8MM_CLK_DISP_APB_ROOT>; + }; + usbotg1: usb@32e40000 { compatible = "fsl,imx8mm-usb", "fsl,imx7d-usb"; reg = <0x32e40000 0x200>;@@ -1029,6 +1146,17 @@ gpmi: nand-controller@33002000{ status = "disabled"; }; + vpumix_blk_ctl: blk-ctl@38330000 { + compatible = "fsl,imx8mm-vpumix-blk-ctl", "syscon"; + reg = <0x38330000 0x100>; + #power-domain-cells = <1>; + #reset-cells = <1>; + power-domains = <&pgc_vpumix>, <&pgc_vpu_g1>, <&pgc_vpu_g2>, <&pgc_vpu_h1>; + power-domain-names = "vpumix", "vpu-g1", "vpu-g2", "vpu-h1"; + clocks = <&clk IMX8MM_CLK_VPU_DEC_ROOT>, <&clk IMX8MM_CLK_VPU_G1_ROOT>, + <&clk IMX8MM_CLK_VPU_G2_ROOT>, <&clk IMX8MM_CLK_VPU_H1_ROOT>; + }; + gic: interrupt-controller@38800000 { compatible = "arm,gic-v3"; reg = <0x38800000 0x10000>, /* GIC Dist */ --2.30.0