hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: reset: at91-reset: introduce args member in at91_reset_data 

Introduce args member in struct at91_reset_data. It stores the value
that needs to be written in mode register so that the reboot actions
to happen. With these changes samx7_restart() could be removed.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Claudiu.Beznea@microchip.com 2020-01-21 10:03:33 +00:00 committed by Sebastian Reichel
parent a5bbad258a
commit 25b80b7d5a
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/power/reset/at91-reset.c
View File

@ -52,6 +52,7 @@ enum reset_type {
struct at91_reset_data { struct at91_reset_data {
int (*notifier_call)(struct notifier_block *this, unsigned long mode, int (*notifier_call)(struct notifier_block *this, unsigned long mode,
void *cmd); void *cmd);
u32 args;
}; };
struct at91_reset { struct at91_reset {
@ -59,6 +60,7 @@ struct at91_reset {
void __iomem *ramc_base[2]; void __iomem *ramc_base[2];
struct clk *sclk; struct clk *sclk;
struct notifier_block nb; struct notifier_block nb;
u32 args;
}; };
/* /*
@ -90,7 +92,7 @@ static int at91sam9260_restart(struct notifier_block *this, unsigned long mode,
"r" (reset->rstc_base), "r" (reset->rstc_base),
"r" (1), "r" (1),
"r" cpu_to_le32(AT91_SDRAMC_LPCB_POWER_DOWN), "r" cpu_to_le32(AT91_SDRAMC_LPCB_POWER_DOWN),
"r" cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST)); "r" (reset->args));
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -135,7 +137,7 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode,
"r" (reset->rstc_base), "r" (reset->rstc_base),
"r" (1), "r" (1),
"r" cpu_to_le32(AT91_DDRSDRC_LPCB_POWER_DOWN), "r" cpu_to_le32(AT91_DDRSDRC_LPCB_POWER_DOWN),
"r" cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST) "r" (reset->args)
: "r0"); : "r0");
return NOTIFY_DONE; return NOTIFY_DONE;
@ -146,19 +148,7 @@ static int sama5d3_restart(struct notifier_block *this, unsigned long mode,
{ {
struct at91_reset *reset = container_of(this, struct at91_reset, nb); struct at91_reset *reset = container_of(this, struct at91_reset, nb);
writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST), writel(reset->args, reset->rstc_base);
reset->rstc_base);
return NOTIFY_DONE;
}
static int samx7_restart(struct notifier_block *this, unsigned long mode,
void *cmd)
{
struct at91_reset *reset = container_of(this, struct at91_reset, nb);
writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PROCRST),
reset->rstc_base);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -210,18 +200,22 @@ static const struct of_device_id at91_ramc_of_match[] = {
static const struct at91_reset_data at91sam9260_reset_data = { static const struct at91_reset_data at91sam9260_reset_data = {
.notifier_call = at91sam9260_restart, .notifier_call = at91sam9260_restart,
.args = AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
}; };
static const struct at91_reset_data at91sam9g45_reset_data = { static const struct at91_reset_data at91sam9g45_reset_data = {
.notifier_call = at91sam9g45_restart, .notifier_call = at91sam9g45_restart,
.args = AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
}; };
static const struct at91_reset_data sama5d3_reset_data = { static const struct at91_reset_data sama5d3_reset_data = {
.notifier_call = sama5d3_restart, .notifier_call = sama5d3_restart,
.args = AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST,
}; };
static const struct at91_reset_data samx7_reset_data = { static const struct at91_reset_data samx7_reset_data = {
.notifier_call = samx7_restart, .notifier_call = sama5d3_restart,
.args = AT91_RSTC_KEY | AT91_RSTC_PROCRST,
}; };
static const struct of_device_id at91_reset_of_match[] = { static const struct of_device_id at91_reset_of_match[] = {
@ -284,6 +278,7 @@ static int __init at91_reset_probe(struct platform_device *pdev)
reset_data = match->data; reset_data = match->data;
reset->nb.notifier_call = reset_data->notifier_call; reset->nb.notifier_call = reset_data->notifier_call;
reset->nb.priority = 192; reset->nb.priority = 192;
reset->args = reset_data->args;
reset->sclk = devm_clk_get(&pdev->dev, NULL); reset->sclk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(reset->sclk)) if (IS_ERR(reset->sclk))