Skip to content

Commit 70eddf4

Browse files
committed
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>
1 parent 83206e7 commit 70eddf4

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

drivers/power/reset/at91-sama5d2_shdwc.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ struct shdwc_config {
7171
struct shdwc {
7272
const struct shdwc_config *cfg;
7373
void __iomem *at91_shdwc_base;
74+
void __iomem *mpddrc_base;
7475
void __iomem *pmc_base;
7576
};
7677

@@ -80,7 +81,6 @@ struct shdwc {
8081
*/
8182
static struct shdwc *at91_shdwc;
8283
static struct clk *sclk;
83-
static void __iomem *mpddrc_base;
8484

8585
static const unsigned long long sdwc_dbc_period[] = {
8686
0, 3, 32, 512, 4096, 32768,
@@ -136,7 +136,7 @@ static void at91_poweroff(void)
136136

137137
" b .\n\t"
138138
:
139-
: "r" (mpddrc_base),
139+
: "r" (at91_shdwc->mpddrc_base),
140140
"r" cpu_to_le32(AT91_DDRSDRC_LPDDR2_PWOFF),
141141
"r" (at91_shdwc->at91_shdwc_base),
142142
"r" cpu_to_le32(AT91_SHDW_KEY | AT91_SHDW_SHDW),
@@ -305,21 +305,22 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
305305
goto unmap;
306306
}
307307

308-
mpddrc_base = of_iomap(np, 0);
308+
at91_shdwc->mpddrc_base = of_iomap(np, 0);
309309
of_node_put(np);
310310

311-
if (!mpddrc_base) {
311+
if (!at91_shdwc->mpddrc_base) {
312312
ret = -ENOMEM;
313313
goto unmap;
314314
}
315315

316316
pm_power_off = at91_poweroff;
317317

318-
ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD;
318+
ddr_type = readl(at91_shdwc->mpddrc_base + AT91_DDRSDRC_MDR) &
319+
AT91_DDRSDRC_MD;
319320
if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 &&
320321
ddr_type != AT91_DDRSDRC_MD_LPDDR3) {
321-
iounmap(mpddrc_base);
322-
mpddrc_base = NULL;
322+
iounmap(at91_shdwc->mpddrc_base);
323+
at91_shdwc->mpddrc_base = NULL;
323324
}
324325

325326
return 0;
@@ -343,8 +344,8 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev)
343344
writel(0, shdw->at91_shdwc_base + AT91_SHDW_MR);
344345
writel(0, shdw->at91_shdwc_base + AT91_SHDW_WUIR);
345346

346-
if (mpddrc_base)
347-
iounmap(mpddrc_base);
347+
if (shdw->mpddrc_base)
348+
iounmap(shdw->mpddrc_base);
348349
iounmap(shdw->pmc_base);
349350

350351
clk_disable_unprepare(sclk);

0 commit comments

Comments
 (0)