summaryrefslogtreecommitdiff
path: root/drivers/power/reset/at91-reset.c
diff options
context:
space:
mode:
authorClaudiu.Beznea@microchip.com <Claudiu.Beznea@microchip.com>2020-01-21 13:03:32 +0300
committerSebastian Reichel <sebastian.reichel@collabora.com>2020-03-08 21:37:35 +0300
commit583ef884c8dc8e5ec9a7fde12d40ef7fdf18f5fb (patch)
treef8802a882cd596a81e4329e656d01339f69ac5e9 /drivers/power/reset/at91-reset.c
parent55f8e6fdefbe926e1729bba3a7608eed7d7f24f5 (diff)
downloadlinux-583ef884c8dc8e5ec9a7fde12d40ef7fdf18f5fb.tar.xz
power: reset: at91-reset: devm_kzalloc() for at91_reset data structure
Allocate at91_reset data on probe and set it as platform data. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/reset/at91-reset.c')
-rw-r--r--drivers/power/reset/at91-reset.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index bd05496c5ac7..7ba77555e9e1 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -56,8 +56,6 @@ struct at91_reset {
struct notifier_block nb;
};
-static struct at91_reset *reset;
-
/*
* unless the SDRAM is cleanly shutdown before we hit the
* reset register it can be left driving the data bus and
@@ -66,6 +64,8 @@ static struct at91_reset *reset;
static int at91sam9260_restart(struct notifier_block *this, unsigned long mode,
void *cmd)
{
+ struct at91_reset *reset = container_of(this, struct at91_reset, nb);
+
asm volatile(
/* Align to cache lines */
".balign 32\n\t"
@@ -93,6 +93,8 @@ static int at91sam9260_restart(struct notifier_block *this, unsigned long mode,
static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode,
void *cmd)
{
+ struct at91_reset *reset = container_of(this, struct at91_reset, nb);
+
asm volatile(
/*
* Test wether we have a second RAM controller to care
@@ -137,6 +139,8 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode,
static int sama5d3_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_PERRST | AT91_RSTC_PROCRST),
reset->rstc_base);
@@ -146,6 +150,8 @@ static int sama5d3_restart(struct notifier_block *this, unsigned long mode,
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);
@@ -210,6 +216,7 @@ MODULE_DEVICE_TABLE(of, at91_reset_of_match);
static int __init at91_reset_probe(struct platform_device *pdev)
{
const struct of_device_id *match;
+ struct at91_reset *reset;
struct device_node *np;
int ret, idx = 0;
@@ -250,6 +257,8 @@ static int __init at91_reset_probe(struct platform_device *pdev)
return ret;
}
+ platform_set_drvdata(pdev, reset);
+
ret = register_restart_handler(&reset->nb);
if (ret) {
clk_disable_unprepare(reset->sclk);
@@ -263,6 +272,8 @@ static int __init at91_reset_probe(struct platform_device *pdev)
static int __exit at91_reset_remove(struct platform_device *pdev)
{
+ struct at91_reset *reset = platform_get_drvdata(pdev);
+
unregister_restart_handler(&reset->nb);
clk_disable_unprepare(reset->sclk);