Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1732903

[PATCH v2 2/9] clk: at91: pmc: Save SCSR during suspend

Show all headers | View raw

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>
---
 drivers/clk/at91/pmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 5c2b26de303e..07dc2861ad3f 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -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);
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Various patches for SAMA5D2 backup mode Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
  [PATCH v2 9/9] tty/serial: atmel: Prevent a warning on suspend Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 9/9] tty/serial: atmel: Prevent a warning on suspend Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-19 12:20 +0200
    Re: [PATCH v2 9/9] tty/serial: atmel: Prevent a warning on suspend Richard Genoud <richard.genoud@gmail.com> - 2017-09-20 16:40 +0200
  [PATCH v2 6/9] ehci-atmel: Power down during suspend is normal Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 6/9] ehci-atmel: Power down during suspend is normal Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-22 14:40 +0200
  [PATCH v2 7/9] pwm: atmel-tcb: Support backup mode Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 7/9] pwm: atmel-tcb: Support backup mode Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-22 14:50 +0200
  [PATCH v2 1/9] clk: at91: pmc: Wait for clocks when resuming Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 1/9] clk: at91: pmc: Wait for clocks when resuming Ludovic Desroches <ludovic.desroches@microchip.com> - 2017-09-22 14:10 +0200
    Re: [PATCH v2 1/9] clk: at91: pmc: Wait for clocks when resuming Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-22 14:20 +0200
  [PATCH v2 5/9] mtd: nand: atmel: Report PMECC failures as errors Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 5/9] mtd: nand: atmel: Report PMECC failures as  errors Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-09-18 12:10 +0200
      Re: [PATCH v2 5/9] mtd: nand: atmel: Report PMECC failures as errors Romain Izard <romain.izard.pro@gmail.com> - 2017-09-21 11:30 +0200
  [PATCH v2 4/9] mtd: nand: atmel: Avoid ECC errors when leaving backup mode Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 4/9] mtd: nand: atmel: Avoid ECC errors when leaving  backup mode Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-09-18 12:00 +0200
  [PATCH v2 2/9] clk: at91: pmc: Save SCSR during suspend Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
  [PATCH v2 8/9] atmel_flexcom: Support backup mode Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 8/9] atmel_flexcom: Support backup mode Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-19 11:30 +0200
      Re: [PATCH v2 8/9] atmel_flexcom: Support backup mode Lee Jones <lee.jones@linaro.org> - 2017-09-19 17:30 +0200
        Re: [PATCH v2 8/9] atmel_flexcom: Support backup mode Romain Izard <romain.izard.pro@gmail.com> - 2017-09-20 10:40 +0200
          Re: [PATCH v2 8/9] atmel_flexcom: Support backup mode Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-09-20 11:20 +0200
  [PATCH v2 3/9] clk: at91: pmc: Support backup for programmable clocks Romain Izard <romain.izard.pro@gmail.com> - 2017-09-15 16:10 +0200
    Re: [PATCH v2 3/9] clk: at91: pmc: Support backup for programmable  clocks Nicolas Ferre <nicolas.ferre@microchip.com> - 2017-09-22 12:40 +0200
      Re: [PATCH v2 3/9] clk: at91: pmc: Support backup for programmable clocks Romain Izard <romain.izard.pro@gmail.com> - 2017-09-25 10:30 +0200

csiph-web