Commit 1df88c68 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'imx-drivers-4.19' of...

Merge tag 'imx-drivers-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers

i.MX drivers update for 4.19:
 - Handle i.MX6SL chip errata ERR006287 in the safest possible way by
   keeping the DISP domain always-on, because Upon resuming from power
   gating, the modules in the display power domain (eLCDIF, EPDC, PXP
   and SPDC) might fail to perform register reads correctly.
 - Use GENPD_FLAG_ALWAYS_ON flag for i.MX6QP PU ERR009619 handling.
   It is functionally identical to the exsiting implementation but
   simpler and slightly faster.

* tag 'imx-drivers-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx6qp: Use GENPD_FLAG_ALWAYS_ON for PU errata
  soc: imx: gpc: Disable 6sl display power gating for ERR006287
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 85a03fe9 69c04aee
...@@ -47,7 +47,6 @@ struct imx_pm_domain { ...@@ -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) ...@@ -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;
...@@ -288,26 +284,31 @@ static struct imx_pm_domain imx_gpc_domains[] = { ...@@ -288,26 +284,31 @@ static struct imx_pm_domain imx_gpc_domains[] = {
struct imx_gpc_dt_data { struct imx_gpc_dt_data {
int num_domains; int num_domains;
bool err009619_present; bool err009619_present;
bool err006287_present;
}; };
static const struct imx_gpc_dt_data imx6q_dt_data = { static const struct imx_gpc_dt_data imx6q_dt_data = {
.num_domains = 2, .num_domains = 2,
.err009619_present = false, .err009619_present = false,
.err006287_present = false,
}; };
static const struct imx_gpc_dt_data imx6qp_dt_data = { static const struct imx_gpc_dt_data imx6qp_dt_data = {
.num_domains = 2, .num_domains = 2,
.err009619_present = true, .err009619_present = true,
.err006287_present = false,
}; };
static const struct imx_gpc_dt_data imx6sl_dt_data = { static const struct imx_gpc_dt_data imx6sl_dt_data = {
.num_domains = 3, .num_domains = 3,
.err009619_present = false, .err009619_present = false,
.err006287_present = true,
}; };
static const struct imx_gpc_dt_data imx6sx_dt_data = { static const struct imx_gpc_dt_data imx6sx_dt_data = {
.num_domains = 4, .num_domains = 4,
.err009619_present = false, .err009619_present = false,
.err006287_present = false,
}; };
static const struct of_device_id imx_gpc_dt_ids[] = { static const struct of_device_id imx_gpc_dt_ids[] = {
...@@ -413,8 +414,13 @@ static int imx_gpc_probe(struct platform_device *pdev) ...@@ -413,8 +414,13 @@ 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 |= imx_gpc_domains[GPC_PGC_DOMAIN_PU].base.flags |=
PGC_DOMAIN_FLAG_NO_PD; GENPD_FLAG_ALWAYS_ON;
/* Keep DISP always on if ERR006287 is present */
if (of_id_data->err006287_present)
imx_gpc_domains[GPC_PGC_DOMAIN_DISPLAY].base.flags |=
GENPD_FLAG_ALWAYS_ON;
if (!pgc_node) { if (!pgc_node) {
ret = imx_gpc_old_dt_init(&pdev->dev, regmap, ret = imx_gpc_old_dt_init(&pdev->dev, regmap,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment