Commit 583ef884 authored by Claudiu.Beznea@microchip.com's avatar Claudiu.Beznea@microchip.com Committed by Sebastian Reichel

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: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 55f8e6fd
...@@ -56,8 +56,6 @@ struct at91_reset { ...@@ -56,8 +56,6 @@ struct at91_reset {
struct notifier_block nb; struct notifier_block nb;
}; };
static struct at91_reset *reset;
/* /*
* unless the SDRAM is cleanly shutdown before we hit the * unless the SDRAM is cleanly shutdown before we hit the
* reset register it can be left driving the data bus and * reset register it can be left driving the data bus and
...@@ -66,6 +64,8 @@ static struct at91_reset *reset; ...@@ -66,6 +64,8 @@ static struct at91_reset *reset;
static int at91sam9260_restart(struct notifier_block *this, unsigned long mode, static int at91sam9260_restart(struct notifier_block *this, unsigned long mode,
void *cmd) void *cmd)
{ {
struct at91_reset *reset = container_of(this, struct at91_reset, nb);
asm volatile( asm volatile(
/* Align to cache lines */ /* Align to cache lines */
".balign 32\n\t" ".balign 32\n\t"
...@@ -93,6 +93,8 @@ static int at91sam9260_restart(struct notifier_block *this, unsigned long mode, ...@@ -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, static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode,
void *cmd) void *cmd)
{ {
struct at91_reset *reset = container_of(this, struct at91_reset, nb);
asm volatile( asm volatile(
/* /*
* Test wether we have a second RAM controller to care * 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, ...@@ -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, static int sama5d3_restart(struct notifier_block *this, unsigned long mode,
void *cmd) 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), writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST),
reset->rstc_base); reset->rstc_base);
...@@ -146,6 +150,8 @@ static int sama5d3_restart(struct notifier_block *this, unsigned long mode, ...@@ -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, static int samx7_restart(struct notifier_block *this, unsigned long mode,
void *cmd) void *cmd)
{ {
struct at91_reset *reset = container_of(this, struct at91_reset, nb);
writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PROCRST), writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PROCRST),
reset->rstc_base); reset->rstc_base);
...@@ -210,6 +216,7 @@ MODULE_DEVICE_TABLE(of, at91_reset_of_match); ...@@ -210,6 +216,7 @@ MODULE_DEVICE_TABLE(of, at91_reset_of_match);
static int __init at91_reset_probe(struct platform_device *pdev) static int __init at91_reset_probe(struct platform_device *pdev)
{ {
const struct of_device_id *match; const struct of_device_id *match;
struct at91_reset *reset;
struct device_node *np; struct device_node *np;
int ret, idx = 0; int ret, idx = 0;
...@@ -250,6 +257,8 @@ static int __init at91_reset_probe(struct platform_device *pdev) ...@@ -250,6 +257,8 @@ static int __init at91_reset_probe(struct platform_device *pdev)
return ret; return ret;
} }
platform_set_drvdata(pdev, reset);
ret = register_restart_handler(&reset->nb); ret = register_restart_handler(&reset->nb);
if (ret) { if (ret) {
clk_disable_unprepare(reset->sclk); clk_disable_unprepare(reset->sclk);
...@@ -263,6 +272,8 @@ static int __init at91_reset_probe(struct platform_device *pdev) ...@@ -263,6 +272,8 @@ static int __init at91_reset_probe(struct platform_device *pdev)
static int __exit at91_reset_remove(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); unregister_restart_handler(&reset->nb);
clk_disable_unprepare(reset->sclk); clk_disable_unprepare(reset->sclk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment