Commit 3c6fad25 authored Dec 11, 2017 by Romain Izard Committed by Stephen Boyd Dec 21, 2017

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: Romain Izard <romain.izard.pro@gmail.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

parent 960e1c4d

drivers/clk/at91/pmc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ static int pmc_suspend(void)
		{
		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_CKGR_UCKR, &pmc_cache.uckr);
		regmap_read(pmcreg, AT91_CKGR_MOR, &pmc_cache.mor);
		@@ -129,7 +129,7 @@ static void pmc_resume(void)
		if (pmc_cache.pllar != tmp)
		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_CKGR_UCKR, pmc_cache.uckr);
		regmap_write(pmcreg, AT91_CKGR_MOR, pmc_cache.mor);

Admin message