Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1732905
| From | Romain Izard <romain.izard.pro@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 3/9] clk: at91: pmc: Support backup for programmable clocks |
| Date | 2017-09-15 16:10 +0200 |
| Message-ID | <upZtF-3TS-33@gated-at.bofh.it> (permalink) |
| References | <upZtD-3TS-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Romain Izard <romain.izard@mobile-devices.fr>
When an AT91 programmable clock is declared in the device tree, register
it into the Power Management Controller driver. On entering suspend mode,
the driver saves and restores the Programmable Clock registers to support
the backup mode for these clocks.
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
---
Changes in v2:
* register PCKs on clock startup
drivers/clk/at91/clk-programmable.c | 2 ++
drivers/clk/at91/pmc.c | 27 +++++++++++++++++++++++++++
drivers/clk/at91/pmc.h | 2 ++
3 files changed, 31 insertions(+)
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c
index 85a449cf61e3..0e6aab1252fc 100644
--- a/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@ -204,6 +204,8 @@ at91_clk_register_programmable(struct regmap *regmap,
if (ret) {
kfree(prog);
hw = ERR_PTR(ret);
+ } else {
+ pmc_register_pck(id);
}
return hw;
diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c
index 07dc2861ad3f..3910b7537152 100644
--- a/drivers/clk/at91/pmc.c
+++ b/drivers/clk/at91/pmc.c
@@ -22,6 +22,7 @@
#include "pmc.h"
#define PMC_MAX_IDS 128
+#define PMC_MAX_PCKS 8
int of_at91_get_clk_range(struct device_node *np, const char *propname,
struct clk_range *range)
@@ -50,6 +51,7 @@ EXPORT_SYMBOL_GPL(of_at91_get_clk_range);
static struct regmap *pmcreg;
static u8 registered_ids[PMC_MAX_IDS];
+static u8 registered_pcks[PMC_MAX_PCKS];
static struct
{
@@ -66,8 +68,10 @@ static struct
u32 pcr[PMC_MAX_IDS];
u32 audio_pll0;
u32 audio_pll1;
+ u32 pckr[PMC_MAX_PCKS];
} pmc_cache;
+/* Clock ID 0 is invalid */
void pmc_register_id(u8 id)
{
int i;
@@ -82,6 +86,21 @@ void pmc_register_id(u8 id)
}
}
+/* Programmable Clock 0 is valid */
+void pmc_register_pck(u8 pck)
+{
+ int i;
+
+ for (i = 0; i < PMC_MAX_PCKS; i++) {
+ if (registered_pcks[i] == 0) {
+ registered_pcks[i] = pck + 1;
+ break;
+ }
+ if (registered_pcks[i] == (pck + 1))
+ break;
+ }
+}
+
static int pmc_suspend(void)
{
int i;
@@ -103,6 +122,10 @@ static int pmc_suspend(void)
regmap_read(pmcreg, AT91_PMC_PCR,
&pmc_cache.pcr[registered_ids[i]]);
}
+ for (i = 0; registered_pcks[i]; i++) {
+ u8 num = registered_pcks[i] - 1;
+ regmap_read(pmcreg, AT91_PMC_PCKR(num), &pmc_cache.pckr[num]);
+ }
return 0;
}
@@ -143,6 +166,10 @@ static void pmc_resume(void)
pmc_cache.pcr[registered_ids[i]] |
AT91_PMC_PCR_CMD);
}
+ for (i = 0; registered_pcks[i]; i++) {
+ u8 num = registered_pcks[i] - 1;
+ regmap_write(pmcreg, AT91_PMC_PCKR(num), pmc_cache.pckr[num]);
+ }
if (pmc_cache.uckr & AT91_PMC_UPLLEN)
mask |= AT91_PMC_LOCKU;
diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h
index 858e8ef7e8db..d22b1fa9ecdc 100644
--- a/drivers/clk/at91/pmc.h
+++ b/drivers/clk/at91/pmc.h
@@ -31,8 +31,10 @@ int of_at91_get_clk_range(struct device_node *np, const char *propname,
#ifdef CONFIG_PM
void pmc_register_id(u8 id);
+void pmc_register_pck(u8 pck);
#else
static inline void pmc_register_id(u8 id) {}
+static inline void pmc_register_pck(u8 pck) {}
#endif
#endif /* __PMC_H_ */
--
2.11.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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