soc: imx6qp: Use GENPD_FLAG_ALWAYS_ON for PU errata

This is functionally identical but simpler and slightly faster.

The PU domain is turned on at boot time and never turned off. In the
current implementation the pm core will repeatedly call power_off when
the domain is unused and get -EBUSY back. If the domain is marked as
"always on" instead the pm core won't even attempt to turn it off.

In theory on 6qp it is safe to turn PU off in suspend, however that is
best accomplished with a new core flag.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index 13ff983f8b69..403f3f2f43bd 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -47,7 +47,6 @@ struct imx_pm_domain {
         unsigned int reg_offs;
         signed char cntr_pdn_bit;
         unsigned int ipg_rate_mhz;
-        unsigned int flags;
 };
 
 static inline struct imx_pm_domain *
@@ -62,9 +61,6 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd)
         int iso, iso2sw;
         u32 val;
 
-        if (pd->flags & PGC_DOMAIN_FLAG_NO_PD)
-                return -EBUSY;
-
         /* Read ISO and ISO2SW power down delays */
         regmap_read(pd->regmap, pd->reg_offs + GPC_PGC_PUPSCR_OFFS, &val);
         iso = val & 0x3f;
@@ -418,8 +414,8 @@ static int imx_gpc_probe(struct platform_device *pdev)
 
         /* Disable PU power down in normal operation if ERR009619 is present */
         if (of_id_data->err009619_present)
-                imx_gpc_domains[GPC_PGC_DOMAIN_PU].flags |=
-                                PGC_DOMAIN_FLAG_NO_PD;
+                imx_gpc_domains[GPC_PGC_DOMAIN_PU].base.flags |=
+                                GENPD_FLAG_ALWAYS_ON;
 
         /* Keep DISP always on if ERR006287 is present */
         if (of_id_data->err006287_present)