From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Russell King <linux@arm.linux.org.uk>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Brown <broonie@kernel.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>
Subject: Re: [PATCH v5 1/5] ARM: at91: pm: create a separate procedure for the ULP0 mode
Date: Thu, 17 Mar 2016 17:14:06 +0100 [thread overview]
Message-ID: <20160317161406.GB2831@piout.net> (raw)
In-Reply-To: <1458111489-23774-2-git-send-email-wenyou.yang@atmel.com>
On 16/03/2016 at 14:58:05 +0800, Wenyou Yang wrote :
> 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>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
>
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> 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
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2016-03-17 16:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 6:58 [PATCH v5 0/5] ARM: at91: pm: add ULP1 mode support Wenyou Yang
2016-03-16 6:58 ` [PATCH v5 1/5] ARM: at91: pm: create a separate procedure for the ULP0 mode Wenyou Yang
2016-03-17 16:14 ` Alexandre Belloni [this message]
2016-03-16 6:58 ` [PATCH v5 4/5] Documentation: atmel-pmc: add DT bindings for fast startup Wenyou Yang
[not found] ` <1458111489-23774-1-git-send-email-wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2016-03-16 6:58 ` [PATCH v5 2/5] ARM: at91: pm: add ULP1 mode support Wenyou Yang
2016-03-17 16:54 ` Alexandre Belloni
2016-03-16 6:58 ` [PATCH v5 3/5] ARM: at91: pm: configure PMC fast startup signals Wenyou Yang
2016-03-17 17:14 ` Alexandre Belloni
2016-03-21 2:24 ` Yang, Wenyou
2016-03-24 11:24 ` Alexandre Belloni
2016-03-31 2:43 ` Yang, Wenyou
2016-03-16 6:58 ` [PATCH v5 5/5] ARM: at91/dt: sama5d2_xplained: add fast_restart node Wenyou Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160317161406.GB2831@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nicolas.ferre@atmel.com \
--cc=pawel.moll@arm.com \
--cc=plagnioj@jcrosoft.com \
--cc=robh+dt@kernel.org \
--cc=wenyou.yang@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).