openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

power: reset: at91-poweroff: use only one poweroff function 

Use only one poweroff function for sama5d2 and adapt it to work for both
scenarios (having LPDDR or not).

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Claudiu Beznea 2018-08-30 14:50:07 +03:00 committed by Sebastian Reichel
parent 9f7195da31
commit 4e018c1e9b
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/power/reset/at91-sama5d2_shdwc.c
View File

@ -109,18 +109,6 @@ static void __init at91_wakeup_status(struct platform_device *pdev)
} }
static void at91_poweroff(void) static void at91_poweroff(void)
{
/* Switch the master clock source to slow clock. */
writel(readl(at91_shdwc->pmc_base + AT91_PMC_MCKR) & ~AT91_PMC_CSS,
at91_shdwc->pmc_base + AT91_PMC_MCKR);
while (!(readl(at91_shdwc->pmc_base + AT91_PMC_SR) & AT91_PMC_MCKRDY))
;
writel(AT91_SHDW_KEY | AT91_SHDW_SHDW,
at91_shdwc->at91_shdwc_base + AT91_SHDW_CR);
}
static void at91_lpddr_poweroff(void)
{ {
asm volatile( asm volatile(
/* Align to cache lines */ /* Align to cache lines */
@ -130,16 +118,18 @@ static void at91_lpddr_poweroff(void)
" ldr r6, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t" " ldr r6, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t"
/* Power down SDRAM0 */ /* Power down SDRAM0 */
" tst %0, #0\n\t"
" beq 1f\n\t"
" str %1, [%0, #" __stringify(AT91_DDRSDRC_LPR) "]\n\t" " str %1, [%0, #" __stringify(AT91_DDRSDRC_LPR) "]\n\t"
/* Switch the master clock source to slow clock. */ /* Switch the master clock source to slow clock. */
" ldr r6, [%4, #" __stringify(AT91_PMC_MCKR) "]\n\t" "1: ldr r6, [%4, #" __stringify(AT91_PMC_MCKR) "]\n\t"
" bic r6, r6, #" __stringify(AT91_PMC_CSS) "\n\t" " bic r6, r6, #" __stringify(AT91_PMC_CSS) "\n\t"
" str r6, [%4, #" __stringify(AT91_PMC_MCKR) "]\n\t" " str r6, [%4, #" __stringify(AT91_PMC_MCKR) "]\n\t"
/* Wait for clock switch. */ /* Wait for clock switch. */
"1: ldr r6, [%4, #" __stringify(AT91_PMC_SR) "]\n\t" "2: ldr r6, [%4, #" __stringify(AT91_PMC_SR) "]\n\t"
" tst r6, #" __stringify(AT91_PMC_MCKRDY) "\n\t" " tst r6, #" __stringify(AT91_PMC_MCKRDY) "\n\t"
" beq 1b\n\t" " beq 2b\n\t"
/* Shutdown CPU */ /* Shutdown CPU */
" str %3, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t" " str %3, [%2, #" __stringify(AT91_SHDW_CR) "]\n\t"
@ -326,10 +316,8 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
pm_power_off = at91_poweroff; pm_power_off = at91_poweroff;
ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD; ddr_type = readl(mpddrc_base + AT91_DDRSDRC_MDR) & AT91_DDRSDRC_MD;
if ((ddr_type == AT91_DDRSDRC_MD_LPDDR2) || if (ddr_type != AT91_DDRSDRC_MD_LPDDR2 &&
(ddr_type == AT91_DDRSDRC_MD_LPDDR3)) { ddr_type != AT91_DDRSDRC_MD_LPDDR3) {
pm_power_off = at91_lpddr_poweroff;
} else {
iounmap(mpddrc_base); iounmap(mpddrc_base);
mpddrc_base = NULL; mpddrc_base = NULL;
} }
@ -348,8 +336,7 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev)
{ {
struct shdwc *shdw = platform_get_drvdata(pdev); struct shdwc *shdw = platform_get_drvdata(pdev);
if (pm_power_off == at91_poweroff || if (pm_power_off == at91_poweroff)
pm_power_off == at91_lpddr_poweroff)
pm_power_off = NULL; pm_power_off = NULL;
/* Reset values to disable wake-up features */ /* Reset values to disable wake-up features */