From: Frieder Schrempf <frieder.schrempf@kontron.de>
To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>,
robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de
Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
p.zabel@pengutronix.de, l.stach@pengutronix.de, krzk@kernel.org,
agx@sigxcpu.org, marex@denx.de, andrew.smirnov@gmail.com,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, ping.bai@nxp.com,
aford173@gmail.com, abel.vesa@nxp.com
Subject: Re: [PATCH 11/16] soc: imx: gpcv2: add support for i.MX8MM power domains
Date: Mon, 3 May 2021 16:37:59 +0200 [thread overview]
Message-ID: <48aed4cc-448e-7452-cce8-ffce929bca3a@kontron.de> (raw)
In-Reply-To: <20210429073050.21039-12-peng.fan@oss.nxp.com>
On 29.04.21 09:30, Peng Fan (OSS) wrote:
> From: Lucas Stach <l.stach@pengutronix.de>
>
> This adds support for the power domains founds on i.MX8MM. The 2D and 3D
s/founds/found/
> GPU domains are abstracted as a single domain in the driver, as they can't
> be powered up/down individually due to a shared reset.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de>
> ---
> drivers/soc/imx/gpcv2.c | 168 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 168 insertions(+)
>
> diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
> index 4a2c2a255d1a..5642dd236c10 100644
> --- a/drivers/soc/imx/gpcv2.c
> +++ b/drivers/soc/imx/gpcv2.c
> @@ -19,6 +19,7 @@
> #include <linux/sizes.h>
> #include <dt-bindings/power/imx7-power.h>
> #include <dt-bindings/power/imx8mq-power.h>
> +#include <dt-bindings/power/imx8mm-power.h>
>
> #define GPC_LPCR_A_CORE_BSC 0x000
>
> @@ -44,6 +45,19 @@
> #define IMX8M_PCIE1_A53_DOMAIN BIT(3)
> #define IMX8M_MIPI_A53_DOMAIN BIT(2)
>
> +#define IMX8MM_VPUH1_A53_DOMAIN BIT(15)
> +#define IMX8MM_VPUG2_A53_DOMAIN BIT(14)
> +#define IMX8MM_VPUG1_A53_DOMAIN BIT(13)
> +#define IMX8MM_DISPMIX_A53_DOMAIN BIT(12)
> +#define IMX8MM_VPUMIX_A53_DOMAIN BIT(10)
> +#define IMX8MM_GPUMIX_A53_DOMAIN BIT(9)
> +#define IMX8MM_GPU_A53_DOMAIN (BIT(8) | BIT(11))
> +#define IMX8MM_DDR1_A53_DOMAIN BIT(7)
> +#define IMX8MM_OTG2_A53_DOMAIN BIT(5)
> +#define IMX8MM_OTG1_A53_DOMAIN BIT(4)
> +#define IMX8MM_PCIE_A53_DOMAIN BIT(3)
> +#define IMX8MM_MIPI_A53_DOMAIN BIT(2)
> +
> #define GPC_PU_PGC_SW_PUP_REQ 0x0f8
> #define GPC_PU_PGC_SW_PDN_REQ 0x104
>
> @@ -67,6 +81,19 @@
> #define IMX8M_PCIE1_SW_Pxx_REQ BIT(1)
> #define IMX8M_MIPI_SW_Pxx_REQ BIT(0)
>
> +#define IMX8MM_VPUH1_SW_Pxx_REQ BIT(13)
> +#define IMX8MM_VPUG2_SW_Pxx_REQ BIT(12)
> +#define IMX8MM_VPUG1_SW_Pxx_REQ BIT(11)
> +#define IMX8MM_DISPMIX_SW_Pxx_REQ BIT(10)
> +#define IMX8MM_VPUMIX_SW_Pxx_REQ BIT(8)
> +#define IMX8MM_GPUMIX_SW_Pxx_REQ BIT(7)
> +#define IMX8MM_GPU_SW_Pxx_REQ (BIT(6) | BIT(9))
> +#define IMX8MM_DDR1_SW_Pxx_REQ BIT(5)
> +#define IMX8MM_OTG2_SW_Pxx_REQ BIT(3)
> +#define IMX8MM_OTG1_SW_Pxx_REQ BIT(2)
> +#define IMX8MM_PCIE_SW_Pxx_REQ BIT(1)
> +#define IMX8MM_MIPI_SW_Pxx_REQ BIT(0)
> +
> #define GPC_M4_PU_PDN_FLG 0x1bc
>
> #define GPC_PU_PWRHSK 0x1fc
> @@ -78,6 +105,17 @@
> #define IMX8M_VPU_HSK_PWRDNREQN BIT(5)
> #define IMX8M_DISP_HSK_PWRDNREQN BIT(4)
>
> +
> +#define IMX8MM_GPUMIX_HSK_PWRDNACKN BIT(29)
> +#define IMX8MM_GPU_HSK_PWRDNACKN (BIT(27) | BIT(28))
> +#define IMX8MM_VPUMIX_HSK_PWRDNACKN BIT(26)
> +#define IMX8MM_DISPMIX_HSK_PWRDNACKN BIT(25)
> +#define IMX8MM_HSIO_HSK_PWRDNACKN (BIT(23) | BIT(24))
> +#define IMX8MM_GPUMIX_HSK_PWRDNREQN BIT(11)
> +#define IMX8MM_GPU_HSK_PWRDNREQN (BIT(9) | BIT(10))
> +#define IMX8MM_VPUMIX_HSK_PWRDNREQN BIT(8)
> +#define IMX8MM_DISPMIX_HSK_PWRDNREQN BIT(7)
> +#define IMX8MM_HSIO_HSK_PWRDNREQN (BIT(5) | BIT(6))
> /*
> * The PGC offset values in Reference Manual
> * (Rev. 1, 01/2018 and the older ones) GPC chapter's
> @@ -100,6 +138,20 @@
> #define IMX8M_PGC_MIPI_CSI2 28
> #define IMX8M_PGC_PCIE2 29
>
> +#define IMX8MM_PGC_MIPI 16
> +#define IMX8MM_PGC_PCIE 17
> +#define IMX8MM_PGC_OTG1 18
> +#define IMX8MM_PGC_OTG2 19
> +#define IMX8MM_PGC_DDR1 21
> +#define IMX8MM_PGC_GPU2D 22
> +#define IMX8MM_PGC_GPUMIX 23
> +#define IMX8MM_PGC_VPUMIX 24
> +#define IMX8MM_PGC_GPU3D 25
> +#define IMX8MM_PGC_DISPMIX 26
> +#define IMX8MM_PGC_VPUG1 27
> +#define IMX8MM_PGC_VPUG2 28
> +#define IMX8MM_PGC_VPUH1 29
> +
> #define GPC_PGC_CTRL(n) (0x800 + (n) * 0x40)
> #define GPC_PGC_SR(n) (GPC_PGC_CTRL(n) + 0xc)
>
> @@ -523,6 +575,121 @@ static const struct imx_pgc_domain_data imx8m_pgc_domain_data = {
> .reg_access_table = &imx8m_access_table,
> };
>
> +static const struct imx_pgc_domain imx8mm_pgc_domains[] = {
> + [IMX8MM_POWER_DOMAIN_HSIOMIX] = {
> + .genpd = {
> + .name = "hsiomix",
> + },
> + .bits = {
> + .pxx = 0, /* no power sequence control */
> + .map = 0, /* no power sequence control */
> + .hskreq = IMX8MM_HSIO_HSK_PWRDNREQN,
> + .hskack = IMX8MM_HSIO_HSK_PWRDNACKN,
> + },
> + },
> +
> + [IMX8MM_POWER_DOMAIN_PCIE] = {
> + .genpd = {
> + .name = "pcie",
> + },
> + .bits = {
> + .pxx = IMX8MM_PCIE_SW_Pxx_REQ,
> + .map = IMX8MM_PCIE_A53_DOMAIN,
> + },
> + .pgc = IMX8MM_PGC_PCIE,
> + },
> +
> + [IMX8MM_POWER_DOMAIN_OTG1] = {
> + .genpd = {
> + .name = "usb-otg1",
> + },
> + .bits = {
> + .pxx = IMX8MM_OTG1_SW_Pxx_REQ,
> + .map = IMX8MM_OTG1_A53_DOMAIN,
> + },
> + .pgc = IMX8MM_PGC_OTG1,
> + },
> +
> + [IMX8MM_POWER_DOMAIN_OTG2] = {
> + .genpd = {
> + .name = "usb-otg2",
> + },
> + .bits = {
> + .pxx = IMX8MM_OTG2_SW_Pxx_REQ,
> + .map = IMX8MM_OTG2_A53_DOMAIN,
> + },
> + .pgc = IMX8MM_PGC_OTG2,
> + },
> +
> + [IMX8MM_POWER_DOMAIN_GPUMIX] = {
> + .genpd = {
> + .name = "gpumix",
> + },
> + .bits = {
> + .pxx = IMX8MM_GPUMIX_SW_Pxx_REQ,
> + .map = IMX8MM_GPUMIX_A53_DOMAIN,
> + .hskreq = IMX8MM_GPUMIX_HSK_PWRDNREQN,
> + .hskack = IMX8MM_GPUMIX_HSK_PWRDNACKN,
> + },
> + .pgc = IMX8MM_PGC_GPUMIX,
> + },
> +
> + [IMX8MM_POWER_DOMAIN_GPU] = {
> + .genpd = {
> + .name = "gpu",
> + },
> + .bits = {
> + .pxx = IMX8MM_GPU_SW_Pxx_REQ,
> + .map = IMX8MM_GPU_A53_DOMAIN,
> + .hskreq = IMX8MM_GPU_HSK_PWRDNREQN,
> + .hskack = IMX8MM_GPU_HSK_PWRDNACKN,
> + },
> + .pgc = IMX8MM_PGC_GPU2D,
> + },
> +};
> +
> +static const struct regmap_range imx8mm_yes_ranges[] = {
> + regmap_reg_range(GPC_LPCR_A_CORE_BSC,
> + GPC_PU_PWRHSK),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_MIPI),
> + GPC_PGC_SR(IMX8MM_PGC_MIPI)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_PCIE),
> + GPC_PGC_SR(IMX8MM_PGC_PCIE)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_OTG1),
> + GPC_PGC_SR(IMX8MM_PGC_OTG1)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_OTG2),
> + GPC_PGC_SR(IMX8MM_PGC_OTG2)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_DDR1),
> + GPC_PGC_SR(IMX8MM_PGC_DDR1)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_GPU2D),
> + GPC_PGC_SR(IMX8MM_PGC_GPU2D)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_GPUMIX),
> + GPC_PGC_SR(IMX8MM_PGC_GPUMIX)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_VPUMIX),
> + GPC_PGC_SR(IMX8MM_PGC_VPUMIX)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_GPU3D),
> + GPC_PGC_SR(IMX8MM_PGC_GPU3D)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_DISPMIX),
> + GPC_PGC_SR(IMX8MM_PGC_DISPMIX)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_VPUG1),
> + GPC_PGC_SR(IMX8MM_PGC_VPUG1)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_VPUG2),
> + GPC_PGC_SR(IMX8MM_PGC_VPUG2)),
> + regmap_reg_range(GPC_PGC_CTRL(IMX8MM_PGC_VPUH1),
> + GPC_PGC_SR(IMX8MM_PGC_VPUH1)),
> +};
> +
> +static const struct regmap_access_table imx8mm_access_table = {
> + .yes_ranges = imx8mm_yes_ranges,
> + .n_yes_ranges = ARRAY_SIZE(imx8mm_yes_ranges),
> +};
> +
> +static const struct imx_pgc_domain_data imx8mm_pgc_domain_data = {
> + .domains = imx8mm_pgc_domains,
> + .domains_num = ARRAY_SIZE(imx8mm_pgc_domains),
> + .reg_access_table = &imx8mm_access_table,
> +};
> +
> static int imx_pgc_domain_probe(struct platform_device *pdev)
> {
> struct imx_pgc_domain *domain = pdev->dev.platform_data;
> @@ -707,6 +874,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,imx8mm-gpc", .data = &imx8mm_pgc_domain_data, },
> { .compatible = "fsl,imx8mq-gpc", .data = &imx8m_pgc_domain_data, },
> { }
> };
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-03 14:40 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 7:30 [PATCH 00/16] soc: imx: gpcv2: support i.MX8MM Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 01/16] soc: imx: gpcv2: move to more ideomatic error handling in probe Peng Fan (OSS)
2021-05-03 13:26 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 02/16] soc: imx: gpcv2: move domain mapping to domain driver probe Peng Fan (OSS)
2021-05-03 13:27 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 03/16] soc: imx: gpcv2: switch to clk_bulk_* API Peng Fan (OSS)
2021-05-03 13:37 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 04/16] soc: imx: gpcv2: split power up and power down sequence control Peng Fan (OSS)
2021-05-03 14:13 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 05/16] soc: imx: gpcv2: wait for ADB400 handshake Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 06/16] soc: imx: gpcv2: add runtime PM support for power-domains Peng Fan (OSS)
2021-05-03 14:18 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 07/16] soc: imx: gpcv2: allow domains without power-sequence control Peng Fan (OSS)
2021-05-03 14:21 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 08/16] dt-bindings: imx: gpcv2: add support for optional resets Peng Fan (OSS)
2021-05-03 14:27 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 09/16] soc: " Peng Fan (OSS)
2021-05-03 14:30 ` Frieder Schrempf
2021-04-29 7:30 ` [PATCH 10/16] dt-bindings: power: add defines for i.MX8MM power domains Peng Fan (OSS)
2021-05-03 19:37 ` Rob Herring
2021-04-29 7:30 ` [PATCH 11/16] soc: imx: gpcv2: add support " Peng Fan (OSS)
2021-05-03 14:37 ` Frieder Schrempf [this message]
2021-04-29 7:30 ` [PATCH 12/16] soc: imx: gpcv2: Add support for missing i.MX8MM VPU/DISPMIX " Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 13/16] soc: imx: gpcv2: correct pm_runtime_get_sync usage Peng Fan (OSS)
2021-04-29 14:25 ` Lucas Stach
2021-04-30 4:43 ` Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 14/16] soc: imx: gpcv2: move reset assert after requesting domain power up Peng Fan (OSS)
2021-04-29 14:28 ` Lucas Stach
2021-04-30 4:51 ` Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 15/16] soc: imx: gpcv2: support reset defer probe Peng Fan (OSS)
2021-04-29 8:39 ` Ahmad Fatoum
2021-04-29 14:30 ` Lucas Stach
2021-04-30 4:51 ` Peng Fan (OSS)
2021-04-29 7:30 ` [PATCH 16/16] soc: imx: gpcv2: remove waiting handshake in power up Peng Fan (OSS)
2021-04-29 14:34 ` Lucas Stach
2021-04-30 4:52 ` Peng Fan (OSS)
2021-04-30 7:14 ` Peng Fan (OSS)
2021-04-30 8:47 ` Lucas Stach
2021-04-29 12:39 ` [PATCH 00/16] soc: imx: gpcv2: support i.MX8MM Adam Ford
2021-04-30 1:33 ` Peng Fan
2021-04-30 3:05 ` Adam Ford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48aed4cc-448e-7452-cce8-ffce929bca3a@kontron.de \
--to=frieder.schrempf@kontron.de \
--cc=abel.vesa@nxp.com \
--cc=aford173@gmail.com \
--cc=agx@sigxcpu.org \
--cc=andrew.smirnov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzk@kernel.org \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=p.zabel@pengutronix.de \
--cc=peng.fan@oss.nxp.com \
--cc=ping.bai@nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).