* [PATCH v2 1/4] ARM: at91: pm: create a separate procedure for the ULP0 mode
2016-02-04 7:37 [PATCH v2 0/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
@ 2016-02-04 7:37 ` Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 2/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Wenyou Yang @ 2016-02-04 7:37 UTC (permalink / raw)
To: Nicolas Ferre, Alexandre Belloni,
Jean-Christophe Plagniol-Villard, Russell King
Cc: linux-clk, Rob Herring, Pawel Moll, Mark Brown, Ian Campbell,
Kumar Gala, linux-arm-kernel, linux-kernel, devicetree,
Wenyou Yang
To make the code more legible and prepare to add the ULP1 mode
support in the future, create a separate procedure for the ULP0 mode.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
Changes in v2: None
arch/arm/mach-at91/pm_suspend.S | 65 ++++++++++++++++++++++++---------------
1 file changed, 40 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index a25defd..5fcffdc 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -107,7 +107,7 @@ ENTRY(at91_pm_suspend_in_sram)
ldr r0, .pm_mode
tst r0, #AT91_PM_SLOW_CLOCK
- beq skip_disable_main_clock
+ beq standby_mode
ldr pmc, .pmc_base
@@ -131,32 +131,13 @@ ENTRY(at91_pm_suspend_in_sram)
orr tmp1, tmp1, #(1 << 29) /* bit 29 always set */
str tmp1, [pmc, #AT91_CKGR_PLLAR]
- /* Turn off the main oscillator */
- ldr tmp1, [pmc, #AT91_CKGR_MOR]
- bic tmp1, tmp1, #AT91_PMC_MOSCEN
- orr tmp1, tmp1, #AT91_PMC_KEY
- str tmp1, [pmc, #AT91_CKGR_MOR]
-
-skip_disable_main_clock:
- ldr pmc, .pmc_base
-
- /* Wait for interrupt */
- at91_cpu_idle
-
- ldr r0, .pm_mode
- tst r0, #AT91_PM_SLOW_CLOCK
- beq skip_enable_main_clock
+ulp0_mode:
+ bl at91_pm_ulp0_mode
+ b ulp_exit
+ulp_exit:
ldr pmc, .pmc_base
- /* Turn on the main oscillator */
- ldr tmp1, [pmc, #AT91_CKGR_MOR]
- orr tmp1, tmp1, #AT91_PMC_MOSCEN
- orr tmp1, tmp1, #AT91_PMC_KEY
- str tmp1, [pmc, #AT91_CKGR_MOR]
-
- wait_moscrdy
-
/* Restore PLLA setting */
ldr tmp1, .saved_pllar
str tmp1, [pmc, #AT91_CKGR_PLLAR]
@@ -177,7 +158,15 @@ skip_disable_main_clock:
wait_mckrdy
-skip_enable_main_clock:
+ b pm_exit
+
+standby_mode:
+ ldr pmc, .pmc_base
+
+ /* Wait for interrupt */
+ at91_cpu_idle
+
+pm_exit:
/* Exit the self-refresh mode */
mov r0, #SRAMC_SELF_FRESH_EXIT
bl at91_sramc_self_refresh
@@ -311,6 +300,32 @@ exit_sramc_sf:
mov pc, lr
ENDPROC(at91_sramc_self_refresh)
+/*
+ * void at91_pm_ulp0_mode(void)
+ */
+ENTRY(at91_pm_ulp0_mode)
+ ldr pmc, .pmc_base
+
+ /* Turn off the crystal oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ bic tmp1, tmp1, #AT91_PMC_MOSCEN
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ /* Wait for interrupt */
+ at91_cpu_idle
+
+ /* Turn on the crystal oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ orr tmp1, tmp1, #AT91_PMC_MOSCEN
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ wait_moscrdy
+
+ mov pc, lr
+ENDPROC(at91_pm_ulp0_mode)
+
.pmc_base:
.word 0
.sramc_base:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 2/4] ARM: at91: pm: add ULP1 mode support
2016-02-04 7:37 [PATCH v2 0/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 1/4] ARM: at91: pm: create a separate procedure for the ULP0 mode Wenyou Yang
@ 2016-02-04 7:37 ` Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 3/4] ARM: at91: pm: configure PMC fast startup signals Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 4/4] Documentation: atmel-pmc: add DT bindings for fast startup Wenyou Yang
3 siblings, 0 replies; 6+ messages in thread
From: Wenyou Yang @ 2016-02-04 7:37 UTC (permalink / raw)
To: Nicolas Ferre, Alexandre Belloni,
Jean-Christophe Plagniol-Villard, Russell King
Cc: linux-clk, Rob Herring, Pawel Moll, Mark Brown, Ian Campbell,
Kumar Gala, linux-arm-kernel, linux-kernel, devicetree,
Wenyou Yang
The ULP1 (Ultra Low-power mode 1) is introduced by SAMA5D2.
In the ULP1 mode, all the clocks are shut off, inclusive the embedded
12MHz RC oscillator, so as to achieve the lowest power consumption
with the system in retention mode and able to resume on the wake up
events. As soon as the wake up event is asserted, the embedded 12MHz
RC oscillator restarts automatically.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
Changes in v2:
- fix label pm_exit to ulp_exit.
arch/arm/mach-at91/pm.c | 16 ++++++-
arch/arm/mach-at91/pm.h | 7 +++
arch/arm/mach-at91/pm_suspend.S | 97 +++++++++++++++++++++++++++++++++++++++
include/linux/clk/at91_pmc.h | 4 ++
4 files changed, 122 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index f82df15..a7aec35 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -36,6 +36,11 @@
#include "generic.h"
#include "pm.h"
+#define ULP0_MODE 0x00
+#define ULP1_MODE 0x11
+
+#define SAMA5D2_PMC_VERSION 0x20540
+
void __iomem *pmc;
/*
@@ -52,6 +57,7 @@ extern void at91_pinctrl_gpio_resume(void);
static struct {
unsigned long uhp_udp_mask;
int memctrl;
+ u32 ulp_mode;
} at91_pm_data;
void __iomem *at91_ramc_base[2];
@@ -141,8 +147,11 @@ static void at91_pm_suspend(suspend_state_t state)
{
unsigned int pm_data = at91_pm_data.memctrl;
- pm_data |= (state == PM_SUSPEND_MEM) ?
- AT91_PM_MODE(AT91_PM_SLOW_CLOCK) : 0;
+ if (state == PM_SUSPEND_MEM) {
+ pm_data |= AT91_PM_MODE(AT91_PM_SLOW_CLOCK);
+ if (at91_pm_data.ulp_mode == ULP1_MODE)
+ pm_data |= AT91_PM_ULP(AT91_PM_ULP1_MODE);
+ }
flush_cache_all();
outer_disable();
@@ -497,4 +506,7 @@ void __init sama5_pm_init(void)
at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
at91_pm_init(NULL);
+
+ if (readl(pmc + AT91_PMC_VERSION) >= SAMA5D2_PMC_VERSION)
+ at91_pm_data.ulp_mode = ULP1_MODE;
}
diff --git a/arch/arm/mach-at91/pm.h b/arch/arm/mach-at91/pm.h
index 3fcf881..2e76745 100644
--- a/arch/arm/mach-at91/pm.h
+++ b/arch/arm/mach-at91/pm.h
@@ -39,4 +39,11 @@ extern void __iomem *at91_ramc_base[];
#define AT91_PM_SLOW_CLOCK 0x01
+#define AT91_PM_ULP_OFFSET 5
+#define AT91_PM_ULP_MASK 0x03
+#define AT91_PM_ULP(x) (((x) & AT91_PM_ULP_MASK) << AT91_PM_ULP_OFFSET)
+
+#define AT91_PM_ULP0_MODE 0x00
+#define AT91_PM_ULP1_MODE 0x01
+
#endif
diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index 5fcffdc..f2a5c4b 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -41,6 +41,15 @@ tmp2 .req r5
.endm
/*
+ * Wait for main oscillator selection is done
+ */
+ .macro wait_moscsels
+1: ldr tmp1, [pmc, #AT91_PMC_SR]
+ tst tmp1, #AT91_PMC_MOSCSELS
+ beq 1b
+ .endm
+
+/*
* Wait until PLLA has locked.
*/
.macro wait_pllalock
@@ -101,6 +110,10 @@ ENTRY(at91_pm_suspend_in_sram)
and r0, r0, #AT91_PM_MODE_MASK
str r0, .pm_mode
+ lsr r0, r3, #AT91_PM_ULP_OFFSET
+ and r0, r0, #AT91_PM_ULP_MASK
+ str r0, .ulp_mode
+
/* Active the self-refresh mode */
mov r0, #SRAMC_SELF_FRESH_ACTIVE
bl at91_sramc_self_refresh
@@ -131,6 +144,13 @@ ENTRY(at91_pm_suspend_in_sram)
orr tmp1, tmp1, #(1 << 29) /* bit 29 always set */
str tmp1, [pmc, #AT91_CKGR_PLLAR]
+ ldr r0, .ulp_mode
+ tst r0, #AT91_PM_ULP1_MODE
+ beq ulp0_mode
+
+ bl at91_pm_ulp1_mode
+ b ulp_exit
+
ulp0_mode:
bl at91_pm_ulp0_mode
b ulp_exit
@@ -326,6 +346,81 @@ ENTRY(at91_pm_ulp0_mode)
mov pc, lr
ENDPROC(at91_pm_ulp0_mode)
+/*
+ * void at91_pm_ulp1_mode(void)
+ */
+ENTRY(at91_pm_ulp1_mode)
+ ldr pmc, .pmc_base
+
+ /* Switch the main clock source to 12-MHz RC oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ bic tmp1, tmp1, #AT91_PMC_MOSCSEL
+ bic tmp1, tmp1, #AT91_PMC_KEY_MASK
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ wait_moscsels
+
+ /* Disable the crystal oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ bic tmp1, tmp1, #AT91_PMC_MOSCEN
+ bic tmp1, tmp1, #AT91_PMC_KEY_MASK
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ /* Switch the master clock source to main clock */
+ ldr tmp1, [pmc, #AT91_PMC_MCKR]
+ bic tmp1, tmp1, #AT91_PMC_CSS
+ orr tmp1, tmp1, #AT91_PMC_CSS_MAIN
+ str tmp1, [pmc, #AT91_PMC_MCKR]
+
+ wait_mckrdy
+
+ /* Enter the ULP1 mode by set WAITMODE bit in CKGR_MOR */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ orr tmp1, tmp1, #AT91_PMC_WAITMODE
+ bic tmp1, tmp1, #AT91_PMC_KEY_MASK
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ wait_mckrdy
+
+ /* Enable the crystal oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ orr tmp1, tmp1, #AT91_PMC_MOSCEN
+ bic tmp1, tmp1, #AT91_PMC_KEY_MASK
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ wait_moscrdy
+
+ /* Switch the master clock source to slow clock */
+ ldr tmp1, [pmc, #AT91_PMC_MCKR]
+ bic tmp1, tmp1, #AT91_PMC_CSS
+ str tmp1, [pmc, #AT91_PMC_MCKR]
+
+ wait_mckrdy
+
+ /* Switch main clock source to crystal oscillator */
+ ldr tmp1, [pmc, #AT91_CKGR_MOR]
+ orr tmp1, tmp1, #AT91_PMC_MOSCSEL
+ bic tmp1, tmp1, #AT91_PMC_KEY_MASK
+ orr tmp1, tmp1, #AT91_PMC_KEY
+ str tmp1, [pmc, #AT91_CKGR_MOR]
+
+ wait_moscsels
+
+ /* Switch the master clock source to main clock */
+ ldr tmp1, [pmc, #AT91_PMC_MCKR]
+ bic tmp1, tmp1, #AT91_PMC_CSS
+ orr tmp1, tmp1, #AT91_PMC_CSS_MAIN
+ str tmp1, [pmc, #AT91_PMC_MCKR]
+
+ wait_mckrdy
+
+ mov pc, lr
+ENDPROC(at91_pm_ulp1_mode)
+
.pmc_base:
.word 0
.sramc_base:
@@ -336,6 +431,8 @@ ENDPROC(at91_pm_ulp0_mode)
.word 0
.pm_mode:
.word 0
+.ulp_mode:
+ .word 0
.saved_mckr:
.word 0
.saved_pllar:
diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
index 17f413b..4afd891 100644
--- a/include/linux/clk/at91_pmc.h
+++ b/include/linux/clk/at91_pmc.h
@@ -47,8 +47,10 @@
#define AT91_CKGR_MOR 0x20 /* Main Oscillator Register [not on SAM9RL] */
#define AT91_PMC_MOSCEN (1 << 0) /* Main Oscillator Enable */
#define AT91_PMC_OSCBYPASS (1 << 1) /* Oscillator Bypass */
+#define AT91_PMC_WAITMODE (1 << 2) /* Wait Mode Command */
#define AT91_PMC_MOSCRCEN (1 << 3) /* Main On-Chip RC Oscillator Enable [some SAM9] */
#define AT91_PMC_OSCOUNT (0xff << 8) /* Main Oscillator Start-up Time */
+#define AT91_PMC_KEY_MASK (0xff << 16)
#define AT91_PMC_KEY (0x37 << 16) /* MOR Writing Key */
#define AT91_PMC_MOSCSEL (1 << 24) /* Main Oscillator Selection [some SAM9] */
#define AT91_PMC_CFDEN (1 << 25) /* Clock Failure Detector Enable [some SAM9] */
@@ -166,6 +168,8 @@
#define AT91_PMC_WPVS (0x1 << 0) /* Write Protect Violation Status */
#define AT91_PMC_WPVSRC (0xffff << 8) /* Write Protect Violation Source */
+#define AT91_PMC_VERSION 0xfc
+
#define AT91_PMC_PCER1 0x100 /* Peripheral Clock Enable Register 1 [SAMA5 only]*/
#define AT91_PMC_PCDR1 0x104 /* Peripheral Clock Enable Register 1 */
#define AT91_PMC_PCSR1 0x108 /* Peripheral Clock Enable Register 1 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 3/4] ARM: at91: pm: configure PMC fast startup signals
2016-02-04 7:37 [PATCH v2 0/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 1/4] ARM: at91: pm: create a separate procedure for the ULP0 mode Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 2/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
@ 2016-02-04 7:37 ` Wenyou Yang
2016-02-04 7:37 ` [PATCH v2 4/4] Documentation: atmel-pmc: add DT bindings for fast startup Wenyou Yang
3 siblings, 0 replies; 6+ messages in thread
From: Wenyou Yang @ 2016-02-04 7:37 UTC (permalink / raw)
To: Nicolas Ferre, Alexandre Belloni,
Jean-Christophe Plagniol-Villard, Russell King
Cc: linux-clk, Rob Herring, Pawel Moll, Mark Brown, Ian Campbell,
Kumar Gala, linux-arm-kernel, linux-kernel, devicetree,
Wenyou Yang
The fast startup signal is used as wake up sources for ULP1 mode.
As soon as a fast startup signal is asserted, the embedded 12 MHz
RC oscillator restarts automatically.
This patch is to configure the fast startup signals, which signal
is enabled to trigger the PMC to wake up the system from ULP1 mode
should be configured via the DT.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
Changes in v2:
- shorten the pmc-fast-startup property's name.
- use the value property, instead of bool property for high
or low triggered.
arch/arm/mach-at91/pm.c | 115 ++++++++++++++++++++++++++++++++++++++++++
include/linux/clk/at91_pmc.h | 32 ++++++++++++
2 files changed, 147 insertions(+)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index a7aec35..6763de8 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -24,6 +24,8 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/clk/at91_pmc.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
#include <asm/irq.h>
#include <linux/atomic.h>
@@ -425,6 +427,117 @@ static void __init at91_pm_sram_init(void)
&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
}
+static int __init at91_pmc_fast_startup_init(void)
+{
+ struct device_node *np;
+ struct regmap *regmap;
+ const char *pm;
+ u32 mode = 0, polarity = 0;
+
+ np = of_find_compatible_node(NULL, NULL,
+ "atmel,sama5d2-pmc-fast-startup");
+ if (!np)
+ return -ENODEV;
+
+ regmap = syscon_node_to_regmap(of_get_parent(np));
+ if (IS_ERR(regmap)) {
+ pr_info("AT91: failed to find PMC fast startup\n");
+ return PTR_ERR(regmap);
+ }
+
+ mode |= of_property_read_bool(np, "atmel,wkup-trigger") ?
+ AT91_PMC_FSTT0 : 0;
+ mode |= of_property_read_bool(np, "atmel,secumod-trigger") ?
+ AT91_PMC_FSTT1 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu0-trigger") ?
+ AT91_PMC_FSTT2 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu1-trigger") ?
+ AT91_PMC_FSTT3 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu2-trigger") ?
+ AT91_PMC_FSTT4 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu3-trigger") ?
+ AT91_PMC_FSTT5 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu4-trigger") ?
+ AT91_PMC_FSTT6 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu5-trigger") ?
+ AT91_PMC_FSTT7 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu6-trigger") ?
+ AT91_PMC_FSTT8 : 0;
+ mode |= of_property_read_bool(np, "atmel,piobu7-trigger") ?
+ AT91_PMC_FSTT9 : 0;
+ mode |= of_property_read_bool(np, "atmel,gmac-wol-trigger") ?
+ AT91_PMC_FSTT10 : 0;
+ mode |= of_property_read_bool(np, "atmel,rtc-alarm-trigger") ?
+ AT91_PMC_RTCAL : 0;
+ mode |= of_property_read_bool(np, "atmel,usb-resume-trigger") ?
+ AT91_PMC_USBAL : 0;
+ mode |= of_property_read_bool(np, "atmel,sdmmc-cd-trigger") ?
+ AT91_PMC_SDMMC_CD : 0;
+ mode |= of_property_read_bool(np, "atmel,rxlp-match-trigger") ?
+ AT91_PMC_RXLP_MCE : 0;
+ mode |= of_property_read_bool(np, "atmel,acc-comparison-trigger") ?
+ AT91_PMC_ACC_CE : 0;
+
+ if (!of_property_read_string(np, "atmel,wkup-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP0;
+ }
+
+ if (mode & AT91_PMC_FSTT1)
+ polarity |= AT91_PMC_FSTP1;
+
+ if (!of_property_read_string(np, "atmel,piobu0-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP2;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu1-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP3;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu2-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP4;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu3-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP5;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu4-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP6;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu5-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP7;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu6-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP8;
+ }
+
+ if (!of_property_read_string(np, "atmel,piobu7-trigger-level", &pm)) {
+ if (!strcasecmp(pm, "high"))
+ polarity |= AT91_PMC_FSTP9;
+ }
+
+ if (mode & AT91_PMC_FSTT10)
+ polarity |= AT91_PMC_FSTP10;
+
+ regmap_write(regmap, AT91_PMC_FSMR, mode);
+
+ regmap_write(regmap, AT91_PMC_FSPR, polarity);
+
+ of_node_put(np);
+
+ return 0;
+}
+
static const struct of_device_id atmel_pmc_ids[] = {
{ .compatible = "atmel,at91rm9200-pmc" },
{ .compatible = "atmel,at91sam9260-pmc" },
@@ -509,4 +622,6 @@ void __init sama5_pm_init(void)
if (readl(pmc + AT91_PMC_VERSION) >= SAMA5D2_PMC_VERSION)
at91_pm_data.ulp_mode = ULP1_MODE;
+
+ at91_pmc_fast_startup_init();
}
diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h
index 4afd891..683580e 100644
--- a/include/linux/clk/at91_pmc.h
+++ b/include/linux/clk/at91_pmc.h
@@ -168,6 +168,38 @@
#define AT91_PMC_WPVS (0x1 << 0) /* Write Protect Violation Status */
#define AT91_PMC_WPVSRC (0xffff << 8) /* Write Protect Violation Source */
+#define AT91_PMC_FSMR 0x70 /* Fast Startup Mode Register */
+#define AT91_PMC_FSTT0 BIT(0) /* WKUP Pin Enable */
+#define AT91_PMC_FSTT1 BIT(1) /* Security Module Enable */
+#define AT91_PMC_FSTT2 BIT(2) /* PIOBU0 Input Enable */
+#define AT91_PMC_FSTT3 BIT(3) /* PIOBU1 Input Enable */
+#define AT91_PMC_FSTT4 BIT(4) /* PIOBU2 Input Enable */
+#define AT91_PMC_FSTT5 BIT(5) /* PIOBU3 Input Enable */
+#define AT91_PMC_FSTT6 BIT(6) /* PIOBU4 Input Enable */
+#define AT91_PMC_FSTT7 BIT(7) /* PIOBU5 Input Enable */
+#define AT91_PMC_FSTT8 BIT(8) /* PIOBU6 Input Enable */
+#define AT91_PMC_FSTT9 BIT(9) /* PIOBU7 Input Enable */
+#define AT91_PMC_FSTT10 BIT(10) /* GMAC Wake-up On LAN Enable */
+#define AT91_PMC_RTCAL BIT(17) /* RTC Alarm Enable */
+#define AT91_PMC_USBAL BIT(18) /* USB Resume Enable */
+#define AT91_PMC_SDMMC_CD BIT(19) /* SDMMC Card Detect Enable */
+#define AT91_PMC_LPM BIT(20) /* Low-power Mode */
+#define AT91_PMC_RXLP_MCE BIT(24) /* Backup UART Receive Enable */
+#define AT91_PMC_ACC_CE BIT(25) /* ACC Enable */
+
+#define AT91_PMC_FSPR 0x74 /* Fast Startup Polarity Reg */
+#define AT91_PMC_FSTP0 BIT(0) /* WKUP Pin Polarity */
+#define AT91_PMC_FSTP1 BIT(1) /* Security Module Polarity */
+#define AT91_PMC_FSTP2 BIT(2) /* PIOBU0 Pin Polarity */
+#define AT91_PMC_FSTP3 BIT(3) /* PIOBU1 Pin Polarity */
+#define AT91_PMC_FSTP4 BIT(4) /* PIOBU2 Pin Polarity */
+#define AT91_PMC_FSTP5 BIT(5) /* PIOBU3 Pin Polarity */
+#define AT91_PMC_FSTP6 BIT(6) /* PIOBU4 Pin Polarity */
+#define AT91_PMC_FSTP7 BIT(7) /* PIOBU5 Pin Polarity */
+#define AT91_PMC_FSTP8 BIT(8) /* PIOBU6 Pin Polarity */
+#define AT91_PMC_FSTP9 BIT(9) /* PIOBU7 Pin Polarity */
+#define AT91_PMC_FSTP10 BIT(10) /* Wake-up On LAN Polarity */
+
#define AT91_PMC_VERSION 0xfc
#define AT91_PMC_PCER1 0x100 /* Peripheral Clock Enable Register 1 [SAMA5 only]*/
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2 4/4] Documentation: atmel-pmc: add DT bindings for fast startup
2016-02-04 7:37 [PATCH v2 0/4] ARM: at91: pm: add ULP1 mode support Wenyou Yang
` (2 preceding siblings ...)
2016-02-04 7:37 ` [PATCH v2 3/4] ARM: at91: pm: configure PMC fast startup signals Wenyou Yang
@ 2016-02-04 7:37 ` Wenyou Yang
[not found] ` <1454571471-4434-5-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
3 siblings, 1 reply; 6+ messages in thread
From: Wenyou Yang @ 2016-02-04 7:37 UTC (permalink / raw)
To: Nicolas Ferre, Alexandre Belloni,
Jean-Christophe Plagniol-Villard, Russell King
Cc: linux-clk, Rob Herring, Pawel Moll, Mark Brown, Ian Campbell,
Kumar Gala, linux-arm-kernel, linux-kernel, devicetree,
Wenyou Yang
Add DT bindings to configurate the PMC_FSMR and PMC_FSPR registers
to trigger a fast restart signal to PMC.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
Changes in v2:
- change the property name and property description.
.../devicetree/bindings/arm/atmel-pmc.txt | 63 ++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/atmel-pmc.txt b/Documentation/devicetree/bindings/arm/atmel-pmc.txt
index 795cc78..1b3833b 100644
--- a/Documentation/devicetree/bindings/arm/atmel-pmc.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-pmc.txt
@@ -12,3 +12,66 @@ Examples:
compatible = "atmel,at91rm9200-pmc";
reg = <0xfffffc00 0x100>;
};
+
+PMC Fast Startup Signals
+
+The PMC Fast Start Signals are used as the wake up source to trigger the PMC
+to wake up the system from the ULP1 mode.
+
+required properties:
+- compatible: Should be "atmel,sama5d2-pmc-fast-startup".
+
+optional properties:
+- atmel,wkup-trigger: boolean, WKUP input can trigger a fast restart signal.
+- atmel,secumod-trigger: boolean, SECUMOD can trigger a fast restart signal.
+- atmel,piobu0-trigger: boolean, PIOBU0 input can trigger a fast restart signal.
+- atmel,piobu1-trigger: boolean, PIOBU1 input can trigger a fast restart signal.
+- atmel,piobu2-trigger: boolean, PIOBU2 input can trigger a fast restart signal.
+- atmel,piobu3-trigger: boolean, PIOBU3 input can trigger a fast restart signal.
+- atmel,piobu4-trigger: boolean, PIOBU4 input can trigger a fast restart signal.
+- atmel,piobu5-trigger: boolean, PIOBU5 input can trigger a fast restart signal.
+- atmel,piobu6-trigger: boolean, PIOBU6 input can trigger a fast restart signal.
+- atmel,piobu7-trigger: boolean, PIOBU7 input can trigger a fast restart signal.
+- atmel,gmac-wol-trigger: boolean, GMAC_WOL can trigger a fast restart signal.
+- atmel,rtc-alarm-trigger: boolean, RTC alarm can trigger a fast restart signal.
+- atmel,usb-resume-trigger: boolean, USB resume can trigger a fast restart
+ signal.
+- atmel,sdmmc-cd-trigger: boolean, SDMMC card detect can trigger a fast
+ restart signal.
+- atmel,rxlp-match-trigger: boolean, Matching condition on RXLP can trigger
+ a fast restart signal.
+- atmel,acc-comparison-trigger: boolean, ACC comparison can trigger a fast
+ restart signal.
+
+- atmel,wkup-trigger-level: string, defines the active polarity of the wake-up
+ input. Supported values are: "high" or "low".
+- atmel,piobu0-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU0 input. Supported values are: "high" or "low".
+- atmel,piobu1-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU1 input. Supported values are: "high" or "low".
+- atmel,piobu2-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU2 input. Supported values are: "high" or "low".
+- atmel,piobu3-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU3 input. Supported values are: "high" or "low".
+- atmel,piobu4-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU4 input. Supported values are: "high" or "low".
+- atmel,piobu5-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU5 input. Supported values are: "high" or "low".
+- atmel,piobu6-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU6 input. Supported values are: "high" or "low".
+- atmel,piobu7-trigger-level: string, defines the active polarity of
+ the corresponding PIOBU7 input. Supported values are: "high" or "low".
+
+Example:
+
+ pmc: pmc@f0014000 {
+ compatible = "atmel,sama5d2-pmc";
+ reg = <0xf0014000 0x160>;
+
+ pmc_fast_restart {
+ compatible = "atmel,sama5d2-pmc-fast-startup";
+ atmel,wkup-trigger;
+ atmel,rtc-alarm-trigger;
+ atmel,wkup-trigger-level = "low";
+ };
+ };
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread