summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorSven Schmitt <Sven.Schmitt@mixed-mode.de>2018-07-24 09:46:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-20 18:45:49 +0100
commit0b8e8bddc5c00c39d28ba9832db0a4e37b006503 (patch)
tree546bf7cfdca55e188e1a482ba020c5107b841fea /drivers/soc
parent7f88d806443f2dad3e62911079e5b184b445e09c (diff)
downloadlinux-stable-0b8e8bddc5c00c39d28ba9832db0a4e37b006503.tar.gz
linux-stable-0b8e8bddc5c00c39d28ba9832db0a4e37b006503.tar.bz2
linux-stable-0b8e8bddc5c00c39d28ba9832db0a4e37b006503.zip
soc: imx: gpc: fix PDN delay
[ Upstream commit 9f4d61d531e0efc9c3283963ae5ef7e314579191 ] imx6_pm_domain_power_off() reads iso and iso2sw from GPC_PGC_PUPSCR_OFFS which stores the power up delays. So use GPC_PGC_PDNSCR_OFFS for the correct delays. Signed-off-by: Sven Schmitt <sven.schmitt@mixed-mode.de> Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/imx/gpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c
index b3da635970ea..d160fc2a7b7a 100644
--- a/drivers/soc/imx/gpc.c
+++ b/drivers/soc/imx/gpc.c
@@ -69,7 +69,7 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd)
u32 val;
/* 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_PDNSCR_OFFS, &val);
iso = val & 0x3f;
iso2sw = (val >> 8) & 0x3f;