p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

power: reset: at91-poweroff: make mpddrc_base part of struct shdwc 

Make mpddrc_base part of struct shdwc since there is also only one
instance of struct shdwc *at91_shdwc in system and to have all data
specific to SHDWC grouped together.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Claudiu Beznea 2018-08-30 14:50:08 +03:00 committed by Sebastian Reichel
parent 4e018c1e9b
commit 9be74f0d39
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/power/reset/at91-sama5d2_shdwc.c
View File

@ -71,6 +71,7 @@ struct shdwc_config {
struct shdwc { struct shdwc {
const struct shdwc_config *cfg; const struct shdwc_config *cfg;
void __iomem *at91_shdwc_base; void __iomem *at91_shdwc_base;
void __iomem *mpddrc_base;
void __iomem *pmc_base; void __iomem *pmc_base;
}; };
@ -80,7 +81,6 @@ struct shdwc {
*/ */
static struct shdwc *at91_shdwc; static struct shdwc *at91_shdwc;
static struct clk *sclk; static struct clk *sclk;
static void __iomem *mpddrc_base;
static const unsigned long long sdwc_dbc_period[] = { static const unsigned long long sdwc_dbc_period[] = {
0, 3, 32, 512, 4096, 32768, 0, 3, 32, 512, 4096, 32768,
@ -136,7 +136,7 @@ static void at91_poweroff(void)
" b .\n\t" " b .\n\t"
: :
: "r" (mpddrc_base), : "r" (at91_shdwc->mpddrc_base),
"r" cpu_to_le32(AT91_DDRSDRC_LPDDR2_PWOFF), "r" cpu_to_le32(AT91_DDRSDRC_LPDDR2_PWOFF),
"r" (at91_shdwc->at91_shdwc_base), "r" (at91_shdwc->at91_shdwc_base),
"r" cpu_to_le32(AT91_SHDW_KEY | AT91_SHDW_SHDW), "r" cpu_to_le32(AT91_SHDW_KEY | AT91_SHDW_SHDW),
@ -305,21 +305,22 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
goto unmap; goto unmap;
} }
mpddrc_base = of_iomap(np, 0); at91_shdwc->mpddrc_base = of_iomap(np, 0);
of_node_put(np); of_node_put(np);
if (!mpddrc_base) { if (!at91_shdwc->mpddrc_base) {
ret = -ENOMEM; ret = -ENOMEM;
goto unmap; goto unmap;
} }
pm_power_off = at91_poweroff; pm_power_off = at91_poweroff;
ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD; ddr_type = readl(at91_shdwc->mpddrc_base + AT91_DDRSDRC_MDR) &
AT91_DDRSDRC_MD;
if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 && if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 &&
ddr_type != AT91_DDRSDRC_MD_LPDDR3) { ddr_type != AT91_DDRSDRC_MD_LPDDR3) {
iounmap(mpddrc_base); iounmap(at91_shdwc->mpddrc_base);
mpddrc_base = NULL; at91_shdwc->mpddrc_base = NULL;
} }
return 0; return 0;
@ -343,8 +344,8 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev)
writel(0, shdw->at91_shdwc_base + AT91_SHDW_MR); writel(0, shdw->at91_shdwc_base + AT91_SHDW_MR);
writel(0, shdw->at91_shdwc_base + AT91_SHDW_WUIR); writel(0, shdw->at91_shdwc_base + AT91_SHDW_WUIR);
if (mpddrc_base) if (shdw->mpddrc_base)
iounmap(mpddrc_base); iounmap(shdw->mpddrc_base);
iounmap(shdw->pmc_base); iounmap(shdw->pmc_base);
clk_disable_unprepare(sclk); clk_disable_unprepare(sclk);