soc: imx: gpcv2: Add support for imx8mm
Subsystems (2)
PATCH 1/2 soc: imx: gpcv2: Add support for imx8mm
The technical reference manual for both the i.MX8MQ and i.MX8M Mini appear to show the same register definitions and locations for the General Power Controller (GPC).
This patch expands the table of compatible SoC's to include the i.MX8m Mini
drivers/soc/imx/gpcv2.c +1 -0
@@ -641,6 +641,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)static const struct of_device_id imx_gpcv2_dt_ids[] = { { .compatible ="fsl,imx7d-gpc" , .data = &imx7_pgc_domain_data, }, { .compatible ="fsl,imx8mq-gpc" , .data = &imx8m_pgc_domain_data, }, + { .compatible ="fsl,imx8mm-gpc" , .data = &imx8m_pgc_domain_data, }, { } };
Signature · 1 line
2.20.1
PATCH 2/2 arm64: dts: Add GPC Support
The General Power Controller (GPC) used on the i.MX8MQ is the same as what is used on the i.MX8M Mini.
This patch adds the GPC support to the device tree for the SoC.
arch/arm64/boot/dts/freescale/imx8mm.dtsi +85 -0
@@ -4,6 +4,7 @@ */ #include <dt-bindings/clock/imx8mm-clock.h> +#include <dt-bindings/power/imx8mq-power.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -498,6 +499,90 @@ interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; #reset-cells = <1>; }; + + gpc: gpc@303a0000 { + compatible = "fsl,imx8mm-gpc"; + reg = <0x303a0000 0x10000>; + interrupt-parent = <&gic>; + interrupt-controller; + #interrupt-cells = <3>; + + pgc { + #address-cells = <1>; + #size-cells = <0>; + + pgc_mipi: power-domain@0 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_MIPI>; + }; + + /* + * As per comment in ATF source code: + * + * PCIE1 and PCIE2 share the + * same reset signal, if we + * power down PCIE2, PCIE1 + * will be held in reset too. + * + * So instead of creating two + * separate power domains for + * PCIE1 and PCIE2 we create a + * link between both and use + * it as a shared PCIE power + * domain. + */ + pgc_pcie: power-domain@1 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_PCIE1>; + power-domains = <&pgc_pcie2>; + }; + + pgc_otg1: power-domain@2 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_USB_OTG1>; + }; + + pgc_otg2: power-domain@3 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_USB_OTG2>; + }; + + pgc_ddr1: power-domain@4 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_DDR1>; + }; + + pgc_gpu: power-domain@5 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_GPU>; + }; + + pgc_vpu: power-domain@6 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_VPU>; + }; + + pgc_disp: power-domain@7 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_DISP>; + }; + + pgc_mipi_csi1: power-domain@8 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_MIPI_CSI1>; + }; + + pgc_mipi_csi2: power-domain@9 { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_MIPI_CSI2>; + }; + + pgc_pcie2: power-domain@a { + #power-domain-cells = <0>; + reg = <IMX8M_POWER_DOMAIN_PCIE2>; + }; + }; + }; }; aips2: bus@30400000 {
Signature · 1 line
2.20.1
Fabio Estevam
reviewerRe: [PATCH 2/2] arm64: dts: Add GPC Support
Hi Adam,
arch/arm64/boot/dts/freescale/imx8mm.dtsi line 504
Quoted 3 lines · Adam Ford
arch/arm64/boot/dts/freescale/imx8mm.dtsi +3
-0+ + gpc: gpc@303a0000 { + compatible = "fsl,imx8mm-gpc";
You could do like this instead:
compatible = "fsl,imx8mm-gpc", "fsl,imx8mq-gpc";
and then you don't need patch 1/2.
Also, "fsl,imx8mm-gpc" needs to be documented.
Fabio Estevam
reviewerRe: [PATCH 2/2] arm64: dts: Add GPC Support
Quoted 9 lines · Fabio Estevam
Hi Adam,
arch/arm64/boot/dts/freescale/imx8mm.dtsi line 504
Quoted 3 lines · Adam Ford
arch/arm64/boot/dts/freescale/imx8mm.dtsi +3
-0+ + gpc: gpc@303a0000 { + compatible = "fsl,imx8mm-gpc";
Quoted 7 lines
You could do like this instead:
compatible = "fsl,imx8mm-gpc", "fsl,imx8mq-gpc";
and then you don't need patch 1/2.
Also, "fsl,imx8mm-gpc" needs to be documented.
One more thing: when you add a v2, please specify the SoC name in the subject line:
arm64: dts: imx8mm: Add GPC Support
Re: [PATCH 2/2] arm64: dts: Add GPC Support
Quoted 11 lines · Fabio Estevam
Quoted 9 lines · Fabio Estevam
Hi Adam,
Quoted 3 lines · Adam Ford
arch/arm64/boot/dts/freescale/imx8mm.dtsi +3
-0+ + gpc: gpc@303a0000 { + compatible = "fsl,imx8mm-gpc";
Quoted 5 lines
Quoted 5 lines
You could do like this instead:
compatible = "fsl,imx8mm-gpc", "fsl,imx8mq-gpc";
and then you don't need patch 1/2.
I like that idea.
Quoted 2 lines
Quoted 2 lines
Also, "fsl,imx8mm-gpc" needs to be documented.
I held off intentionally because of all the txt->yaml conversion, I didn't want to get stuck in the middle of that.
Would an tweak to the txt file be accepted?
If not, should I just use the "fsl,imx8mq-gpc" and leave it alone?
Quoted 5 lines
One more thing: when you add a v2, please specify the SoC name in the subject line:
arm64: dts: imx8mm: Add GPC Support
Good catch. Sorry about that.
adam
Fabio Estevam
reviewerRe: [PATCH 2/2] arm64: dts: Add GPC Support
Quoted 4 lines · Adam Ford
I held off intentionally because of all the
txt->yamlconversion, I didn't want to get stuck in the middle of that.Would an tweak to the txt file be accepted?
Yes, a patch to the existing txt binding should be fine.
Quoted 14 lines · Adam Ford
The technical reference manual for both the i.MX8MQ and i.MX8M Mini appear to show the same register definitions and locations for the General Power Controller (GPC).
This patch expands the table of compatible SoC's to include the i.MX8m Mini
Signed-off-by Adam Ford <[email protected]>drivers/soc/imx/gpcv2.c +0
-0
drivers/soc/imx/gpcv2.c static int imx_gpcv2_probe(struct platform_device *pdev) · line 644
Quoted 4 lines
drivers/soc/imx/gpcv2.c +1
-0@@ -641,6 +641,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)static const struct of_device_id imx_gpcv2_dt_ids[] = { { .compatible ="fsl,imx7d-gpc" , .data = &imx7_pgc_domain_data, }, { .compatible ="fsl,imx8mq-gpc" , .data = &imx8m_pgc_domain_data, }, + { .compatible ="fsl,imx8mm-gpc" , .data = &imx8m_pgc_domain_data, },
According to the 5.2.5.1 "PGC power domains" chapters in both the i.MX 8M Dual/8M QuadLite/8M Quad and i.MX 8M Mini Applications Processor Reference Manuals (Rev.1), the two SoCs have a different list of power domains:
i.MX8MQ:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_MF PGC_OTG1 PGC_OTG2 PGC_PCIE PGC_MIPI PGC_DDR1 PGC_DDR2 PGC_VPU PGC_GPU PGC_HDMI PGC_DISP PGC_MIPI_CSI1 PGC_MIPI_CSI2 PGC_PCIE2
i.MX8MM:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_NOC PGC_PCIE PGC_OTG1 PGC_OTG2 PGC_DDR1 PGC_DISPMIX GPC_MIPI PGC_GPUMIX PGC_GPU_3D PGC_GPU_2D PGC_VPUMIX PGC_VPU_G1 PGC_VPU_G2 PGC_VPU_H1
regards
Philipp
Quoted 11 lines · Philipp Zabel
Quoted 9 lines · Adam Ford
The technical reference manual for both the i.MX8MQ and i.MX8M Mini appear to show the same register definitions and locations for the General Power Controller (GPC).
This patch expands the table of compatible SoC's to include the i.MX8m Mini
Signed-off-by Adam Ford <[email protected]>
Quoted 14 lines
drivers/soc/imx/gpcv2.c static int imx_gpcv2_probe(struct platform_device *pdev) · line 644
Quoted 9 lines
drivers/soc/imx/gpcv2.c +1
-0@@ -641,6 +641,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)static const struct of_device_id imx_gpcv2_dt_ids[] = { { .compatible ="fsl,imx7d-gpc" , .data = &imx7_pgc_domain_data, }, { .compatible ="fsl,imx8mq-gpc" , .data = &imx8m_pgc_domain_data, }, + { .compatible ="fsl,imx8mm-gpc" , .data = &imx8m_pgc_domain_data, },According to the 5.2.5.1 "PGC power domains" chapters in both the i.MX 8M Dual/8M QuadLite/8M Quad and i.MX 8M Mini Applications Processor Reference Manuals (Rev.1), the two SoCs have a different list of power domains:
Shoot. I needed to go further down in the table. I stopped after the first four.
Sorry for the noise.
adam
Quoted 46 lines
i.MX8MQ:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_MF PGC_OTG1 PGC_OTG2 PGC_PCIE PGC_MIPI PGC_DDR1 PGC_DDR2 PGC_VPU PGC_GPU PGC_HDMI PGC_DISP PGC_MIPI_CSI1 PGC_MIPI_CSI2 PGC_PCIE2i.MX8MM:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_NOC PGC_PCIE PGC_OTG1 PGC_OTG2 PGC_DDR1 PGC_DISPMIX GPC_MIPI PGC_GPUMIX PGC_GPU_3D PGC_GPU_2D PGC_VPUMIX PGC_VPU_G1 PGC_VPU_G2 PGC_VPU_H1regards
Philipp
Quoted 28 lines · Adam Ford
Quoted 11 lines · Philipp Zabel
Quoted 9 lines · Adam Ford
The technical reference manual for both the i.MX8MQ and i.MX8M Mini appear to show the same register definitions and locations for the General Power Controller (GPC).
This patch expands the table of compatible SoC's to include the i.MX8m Mini
Signed-off-by Adam Ford <[email protected]>Quoted 14 lines
drivers/soc/imx/gpcv2.c static int imx_gpcv2_probe(struct platform_device *pdev) · line 644
Quoted 9 lines
drivers/soc/imx/gpcv2.c +1
-0@@ -641,6 +641,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)static const struct of_device_id imx_gpcv2_dt_ids[] = { { .compatible ="fsl,imx7d-gpc" , .data = &imx7_pgc_domain_data, }, { .compatible ="fsl,imx8mq-gpc" , .data = &imx8m_pgc_domain_data, }, + { .compatible ="fsl,imx8mm-gpc" , .data = &imx8m_pgc_domain_data, },According to the 5.2.5.1 "PGC power domains" chapters in both the i.MX 8M Dual/8M QuadLite/8M Quad and i.MX 8M Mini Applications Processor Reference Manuals (Rev.1), the two SoCs have a different list of power domains:
Quoted 48 lines
Shoot. I needed to go further down in the table. I stopped after the first four.
Sorry for the noise.
adam
Quoted 42 lines
i.MX8MQ:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_MF PGC_OTG1 PGC_OTG2 PGC_PCIE PGC_MIPI PGC_DDR1 PGC_DDR2 PGC_VPU PGC_GPU PGC_HDMI PGC_DISP PGC_MIPI_CSI1 PGC_MIPI_CSI2 PGC_PCIE2i.MX8MM:
PGC_C0 PGC_C1 PGC_C2 PGC_C3 PGC_SCU PGC_NOC PGC_PCIE PGC_OTG1 PGC_OTG2 PGC_DDR1 PGC_DISPMIX GPC_MIPI PGC_GPUMIX PGC_GPU_3D PGC_GPU_2D PGC_VPUMIX PGC_VPU_G1 PGC_VPU_G2 PGC_VPU_H1
Philipp,
Thanks for reviewing it and catching my mistake.
I went though the datasheet more thoroughly, and I think I have the table correct for the i.MX8M Mini. With that and a small tweak to the OTG nodes, I was able to use USB OTG1 and OTG2 ports.
I am going to submit a V2 fix tomorrow after I clean it up. I'll do a multi-part series where part 1 is the GPC, part 2 will be the OTG updates, and if I get more peripherals working, I'll add them as additional parts to the series.
adam
Quoted 4 lines
Quoted 4 lines
regards
Philipp