|
@@ -47,7 +47,6 @@ struct imx_pm_domain {
|
|
unsigned int reg_offs;
|
|
unsigned int reg_offs;
|
|
signed char cntr_pdn_bit;
|
|
signed char cntr_pdn_bit;
|
|
unsigned int ipg_rate_mhz;
|
|
unsigned int ipg_rate_mhz;
|
|
- unsigned int flags;
|
|
|
|
};
|
|
};
|
|
|
|
|
|
static inline struct imx_pm_domain *
|
|
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;
|
|
int iso, iso2sw;
|
|
u32 val;
|
|
u32 val;
|
|
|
|
|
|
- if (pd->flags & PGC_DOMAIN_FLAG_NO_PD)
|
|
|
|
- return -EBUSY;
|
|
|
|
-
|
|
|
|
/* Read ISO and ISO2SW power down delays */
|
|
/* Read ISO and ISO2SW power down delays */
|
|
regmap_read(pd->regmap, pd->reg_offs + GPC_PGC_PUPSCR_OFFS, &val);
|
|
regmap_read(pd->regmap, pd->reg_offs + GPC_PGC_PUPSCR_OFFS, &val);
|
|
iso = val & 0x3f;
|
|
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 */
|
|
/* Disable PU power down in normal operation if ERR009619 is present */
|
|
if (of_id_data->err009619_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 */
|
|
/* Keep DISP always on if ERR006287 is present */
|
|
if (of_id_data->err006287_present)
|
|
if (of_id_data->err006287_present)
|