openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJbUaVMAAoJEFBXWFqHsHzOOWsH/2hLUZXFrxFeXrp2k1WpJCIz
 PHpPfgiRTwYDb/79xo1kGJMZ2sB+q129E51zRzK/CeBNhkr04VRisP1SsnLED4OT
 1jCI4Ji7rMhfY37b8mtPbXEM+bue0B5FKjrzixp49XelWEK2o4/ESojrRFnh9jgL
 p7lYD7YcHCXiRkB3KIPNGC/cGYRvsQOfGHMIfMY52RDLlBPPc+BRFInHLiBUdQaM
 9hMu886r3mg3HHuCpyNiKb6OAQuJiRo8Ukj13apqO48/VgAnxG06x7MbMI2v94wC
 XudqthIeRnrpK/jl2AXIbgtTUuwH8Yh9NHUePHuIspdJV6wXdZr55IPgPJjsg3Q=
 =yFeo
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-21 15:05:16 -07:00
parent 85a03fe92c 69c04aee34
commit 1df88c683e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/soc/imx/gpc.c
View File

@ -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;
@ -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)
/* 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,