Commit 6764aca1 authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Sebastian Reichel

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

Make sclk part of struct shdwc to have all the data specific to SHDWC
grouped together in one structure.
Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 9be74f0d
...@@ -70,6 +70,7 @@ struct shdwc_config { ...@@ -70,6 +70,7 @@ struct shdwc_config {
struct shdwc { struct shdwc {
const struct shdwc_config *cfg; const struct shdwc_config *cfg;
struct clk *sclk;
void __iomem *at91_shdwc_base; void __iomem *at91_shdwc_base;
void __iomem *mpddrc_base; void __iomem *mpddrc_base;
void __iomem *pmc_base; void __iomem *pmc_base;
...@@ -80,7 +81,6 @@ struct shdwc { ...@@ -80,7 +81,6 @@ struct shdwc {
* since pm_power_off itself is global. * since pm_power_off itself is global.
*/ */
static struct shdwc *at91_shdwc; static struct shdwc *at91_shdwc;
static struct clk *sclk;
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,
...@@ -271,11 +271,11 @@ static int __init at91_shdwc_probe(struct platform_device *pdev) ...@@ -271,11 +271,11 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
match = of_match_node(at91_shdwc_of_match, pdev->dev.of_node); match = of_match_node(at91_shdwc_of_match, pdev->dev.of_node);
at91_shdwc->cfg = match->data; at91_shdwc->cfg = match->data;
sclk = devm_clk_get(&pdev->dev, NULL); at91_shdwc->sclk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(sclk)) if (IS_ERR(at91_shdwc->sclk))
return PTR_ERR(sclk); return PTR_ERR(at91_shdwc->sclk);
ret = clk_prepare_enable(sclk); ret = clk_prepare_enable(at91_shdwc->sclk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Could not enable slow clock\n"); dev_err(&pdev->dev, "Could not enable slow clock\n");
return ret; return ret;
...@@ -328,7 +328,7 @@ static int __init at91_shdwc_probe(struct platform_device *pdev) ...@@ -328,7 +328,7 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
unmap: unmap:
iounmap(at91_shdwc->pmc_base); iounmap(at91_shdwc->pmc_base);
clk_disable: clk_disable:
clk_disable_unprepare(sclk); clk_disable_unprepare(at91_shdwc->sclk);
return ret; return ret;
} }
...@@ -348,7 +348,7 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev) ...@@ -348,7 +348,7 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev)
iounmap(shdw->mpddrc_base); iounmap(shdw->mpddrc_base);
iounmap(shdw->pmc_base); iounmap(shdw->pmc_base);
clk_disable_unprepare(sclk); clk_disable_unprepare(shdw->sclk);
return 0; return 0;
} }
......
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