提交 3c6fad25 编写于 作者: R Romain Izard 提交者: Stephen Boyd

clk: at91: pmc: Save SCSR during suspend

The contents of the System Clock Status Register (SCSR) needs to be
restored into the System Clock Enable Register (SCER).

As the bootloader will restore some clocks by itself, the issue can be
missed as only the USB controller, the LCD controller, the Image Sensor
controller and the programmable clocks will be impacted.

Fix the obvious typo in the suspend/resume code, as the IMR register
does not need to be saved twice.
Signed-off-by: NRomain Izard <romain.izard.pro@gmail.com>
Acked-by: NNicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: NAlexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: NStephen Boyd <sboyd@codeaurora.org>
上级 960e1c4d
...@@ -86,7 +86,7 @@ static int pmc_suspend(void) ...@@ -86,7 +86,7 @@ static int pmc_suspend(void)
{ {
int i; int i;
regmap_read(pmcreg, AT91_PMC_IMR, &pmc_cache.scsr); regmap_read(pmcreg, AT91_PMC_SCSR, &pmc_cache.scsr);
regmap_read(pmcreg, AT91_PMC_PCSR, &pmc_cache.pcsr0); regmap_read(pmcreg, AT91_PMC_PCSR, &pmc_cache.pcsr0);
regmap_read(pmcreg, AT91_CKGR_UCKR, &pmc_cache.uckr); regmap_read(pmcreg, AT91_CKGR_UCKR, &pmc_cache.uckr);
regmap_read(pmcreg, AT91_CKGR_MOR, &pmc_cache.mor); regmap_read(pmcreg, AT91_CKGR_MOR, &pmc_cache.mor);
...@@ -129,7 +129,7 @@ static void pmc_resume(void) ...@@ -129,7 +129,7 @@ static void pmc_resume(void)
if (pmc_cache.pllar != tmp) if (pmc_cache.pllar != tmp)
pr_warn("PLLAR was not configured properly by the firmware\n"); pr_warn("PLLAR was not configured properly by the firmware\n");
regmap_write(pmcreg, AT91_PMC_IMR, pmc_cache.scsr); regmap_write(pmcreg, AT91_PMC_SCER, pmc_cache.scsr);
regmap_write(pmcreg, AT91_PMC_PCER, pmc_cache.pcsr0); regmap_write(pmcreg, AT91_PMC_PCER, pmc_cache.pcsr0);
regmap_write(pmcreg, AT91_CKGR_UCKR, pmc_cache.uckr); regmap_write(pmcreg, AT91_CKGR_UCKR, pmc_cache.uckr);
regmap_write(pmcreg, AT91_CKGR_MOR, pmc_cache.mor); regmap_write(pmcreg, AT91_CKGR_MOR, pmc_cache.mor);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册