Commit 8ff12ad3 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre

ARM: at91/pm_slowclock: function slow_clock() accepts parameters

Change slow_clock()/at91_slow_clock() prototype to accept the PMC
base address and one or two RAM controller addresses by parameters.
The r0, r1 and r2 registers are used differently and preserved during
function call.
Those values are defined in pm.c and slow_clock() function is called
from there with its new parameters.

This will allow to have a soc independent pm_slowclock.
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Ached-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 0dcfed14
...@@ -188,13 +188,27 @@ int at91_suspend_entering_slow_clock(void) ...@@ -188,13 +188,27 @@ int at91_suspend_entering_slow_clock(void)
EXPORT_SYMBOL(at91_suspend_entering_slow_clock); EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
static void (*slow_clock)(void); static void (*slow_clock)(void __iomem *pmc, void __iomem *ramc0, void __iomem *ramc1);
#ifdef CONFIG_AT91_SLOW_CLOCK #ifdef CONFIG_AT91_SLOW_CLOCK
extern void at91_slow_clock(void); extern void at91_slow_clock(void __iomem *pmc, void __iomem *ramc0, void __iomem *ramc1);
extern u32 at91_slow_clock_sz; extern u32 at91_slow_clock_sz;
#endif #endif
static void __iomem *at91_pmc_base = (void __iomem*)(AT91_VA_BASE_SYS + AT91_PMC);
#ifdef CONFIG_ARCH_AT91RM9200
static void __iomem *at91_ramc0_base = (void __iomem*)AT91_VA_BASE_SYS;
#elif defined(CONFIG_ARCH_AT91SAM9G45)
static void __iomem *at91_ramc0_base = (void __iomem*)(AT91_VA_BASE_SYS + AT91_DDRSDRC0);
#else
static void __iomem *at91_ramc0_base = (void __iomem*)(AT91_VA_BASE_SYS + AT91_SDRAMC0);
#endif
#if defined(CONFIG_ARCH_AT91SAM9G45)
static void __iomem *at91_ramc1_base = (void __iomem*)(AT91_VA_BASE_SYS + AT91_DDRSDRC1);
#else
static void __iomem *at91_ramc1_base = NULL;
#endif
static int at91_pm_enter(suspend_state_t state) static int at91_pm_enter(suspend_state_t state)
{ {
...@@ -232,7 +246,7 @@ static int at91_pm_enter(suspend_state_t state) ...@@ -232,7 +246,7 @@ static int at91_pm_enter(suspend_state_t state)
/* copy slow_clock handler to SRAM, and call it */ /* copy slow_clock handler to SRAM, and call it */
memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz); memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz);
#endif #endif
slow_clock(); slow_clock(at91_pmc_base, at91_ramc0_base, at91_ramc1_base);
break; break;
} else { } else {
pr_info("AT91: PM - no slow clock mode enabled ...\n"); pr_info("AT91: PM - no slow clock mode enabled ...\n");
......
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
#define PLLALOCK_TIMEOUT 1000 #define PLLALOCK_TIMEOUT 1000
#define PLLBLOCK_TIMEOUT 1000 #define PLLBLOCK_TIMEOUT 1000
pmc .req r1 pmc .req r0
sdramc .req r2 sdramc .req r1
ramc1 .req r2
tmp1 .req r3 tmp1 .req r3
tmp2 .req r4 tmp2 .req r4
ramc1 .req r5
/* /*
* Wait until master clock is ready (after switching master clock source) * Wait until master clock is ready (after switching master clock source)
...@@ -110,21 +110,19 @@ ramc1 .req r5 ...@@ -110,21 +110,19 @@ ramc1 .req r5
.text .text
/* void at91_slow_clock(void __iomem *pmc, void __iomem *sdramc, void __iomem *ramc1) */
ENTRY(at91_slow_clock) ENTRY(at91_slow_clock)
/* Save registers on stack */ /* Save registers on stack */
stmfd sp!, {r0 - r12, lr} stmfd sp!, {r3 - r12, lr}
/* /*
* Register usage: * Register usage:
* R1 = Base address of AT91_PMC * R0 = Base address of AT91_PMC
* R2 = Base address of RAM Controller (SDRAM, DDRSDR, or AT91_SYS) * R1 = Base address of RAM Controller (SDRAM, DDRSDR, or AT91_SYS)
* R2 = Base address of second RAM Controller or 0 if not present
* R3 = temporary register * R3 = temporary register
* R4 = temporary register * R4 = temporary register
* R5 = Base address of second RAM Controller or 0 if not present
*/ */
ldr pmc, .at91_va_base_pmc
ldr sdramc, .at91_va_base_sdramc
ldr ramc1, .at91_va_base_ramc1
/* Drain write buffer */ /* Drain write buffer */
mov tmp1, #0 mov tmp1, #0
...@@ -283,7 +281,7 @@ ENTRY(at91_slow_clock) ...@@ -283,7 +281,7 @@ ENTRY(at91_slow_clock)
#endif #endif
/* Restore registers, and return */ /* Restore registers, and return */
ldmfd sp!, {r0 - r12, pc} ldmfd sp!, {r3 - r12, pc}
.saved_mckr: .saved_mckr:
...@@ -301,26 +299,5 @@ ENTRY(at91_slow_clock) ...@@ -301,26 +299,5 @@ ENTRY(at91_slow_clock)
.saved_sam9_lpr1: .saved_sam9_lpr1:
.word 0 .word 0
.at91_va_base_pmc:
.word AT91_VA_BASE_SYS + AT91_PMC
#ifdef CONFIG_ARCH_AT91RM9200
.at91_va_base_sdramc:
.word AT91_VA_BASE_SYS
#elif defined(CONFIG_ARCH_AT91SAM9G45)
.at91_va_base_sdramc:
.word AT91_VA_BASE_SYS + AT91_DDRSDRC0
#else
.at91_va_base_sdramc:
.word AT91_VA_BASE_SYS + AT91_SDRAMC0
#endif
.at91_va_base_ramc1:
#if defined(CONFIG_ARCH_AT91SAM9G45)
.word AT91_VA_BASE_SYS + AT91_DDRSDRC1
#else
.word 0
#endif
ENTRY(at91_slow_clock_sz) ENTRY(at91_slow_clock_sz)
.word .-at91_slow_clock .word .-at91_slow_clock
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment