From: eric.y.miao@gmail.com (Eric Miao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] ARM: PXA: Z2: Add poweroff function
Date: Tue, 5 Jul 2011 14:58:34 +0800 [thread overview]
Message-ID: <CAMPhdO97oQETeu5hiiVsxpAS5BC6up7SkLYceAB3Ag+AwJLYtQ@mail.gmail.com> (raw)
In-Reply-To: <1300219877-32160-1-git-send-email-anarsoul@gmail.com>
On Wed, Mar 16, 2011 at 4:11 AM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Applied.
> ---
> v2:
> ?- clear PSPR before going deep sleep
>
> ?arch/arm/mach-pxa/z2.c | ? 17 +++++++++++++++++
> ?1 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
> index 3d3f019..a9ab8c1 100644
> --- a/arch/arm/mach-pxa/z2.c
> +++ b/arch/arm/mach-pxa/z2.c
> @@ -40,6 +40,7 @@
> ?#include <mach/pxafb.h>
> ?#include <mach/mmc.h>
> ?#include <plat/pxa27x_keypad.h>
> +#include <mach/pm.h>
>
> ?#include "generic.h"
> ?#include "devices.h"
> @@ -677,6 +678,20 @@ static void __init z2_pmic_init(void)
> ?static inline void z2_pmic_init(void) {}
> ?#endif
>
> +#ifdef CONFIG_PM
> +static void z2_power_off(void)
> +{
> + ? ? ? /* We're using deep sleep as poweroff, so clear PSPR to ensure that
> + ? ? ? ?* bootloader will jump to its entry point in resume handler
> + ? ? ? ?*/
> + ? ? ? PSPR = 0x0;
> + ? ? ? local_irq_disable();
> + ? ? ? pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);
> +}
> +#else
> +#define z2_power_off ? NULL
> +#endif
> +
> ?/******************************************************************************
> ?* Machine init
> ?******************************************************************************/
> @@ -698,6 +713,8 @@ static void __init z2_init(void)
> ? ? ? ?z2_leds_init();
> ? ? ? ?z2_keys_init();
> ? ? ? ?z2_pmic_init();
> +
> + ? ? ? pm_power_off = z2_power_off;
> ?}
>
> ?MACHINE_START(ZIPIT2, "Zipit Z2")
> --
> 1.7.4.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
next prev parent reply other threads:[~2011-07-05 6:58 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 10:23 [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Vasily Khoruzhick
2011-03-11 10:23 ` [PATCH 2/8] ARM: PXA: Z2: Enable OHCI on Zipit Z2 Vasily Khoruzhick
2011-03-11 14:56 ` [PATCH v2 " Vasily Khoruzhick
2011-03-11 21:42 ` Marek Vasut
2011-03-11 21:49 ` Vasily Khoruzhick
2011-03-11 21:50 ` Marek Vasut
2011-03-11 21:55 ` Vasily Khoruzhick
2011-03-11 22:13 ` Marek Vasut
2011-03-11 22:34 ` Vasily Khoruzhick
2011-03-12 0:07 ` Marek Vasut
2011-03-12 11:32 ` Vasily Khoruzhick
2011-03-12 13:28 ` Marek Vasut
2011-03-13 10:18 ` Pavel Machek
2011-03-13 12:29 ` Marek Vasut
2011-03-13 17:10 ` Pavel Machek
2011-03-13 18:34 ` Marek Vasut
2011-03-13 22:15 ` Vasily Khoruzhick
2011-03-11 21:41 ` [PATCH " Marek Vasut
2011-03-11 10:23 ` [PATCH 3/8] ARM: PXA: Z2: Fix battery pdata Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 4/8] ARM: PXA: Z2: Add mtd partition with logo Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 22:31 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-15 14:39 ` Pavel Machek
2011-03-16 14:11 ` Marek Vasut
2011-03-16 16:51 ` Pavel Machek
2011-03-11 10:23 ` [PATCH 5/8] ARM: PXA: Z2: Add poweroff function Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 21:53 ` Vasily Khoruzhick
2011-03-11 22:08 ` Marek Vasut
2011-03-11 22:12 ` Vasily Khoruzhick
2011-03-11 22:16 ` Marek Vasut
2011-03-11 22:30 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-12 2:29 ` Eric Miao
2011-03-12 8:06 ` Vasily Khoruzhick
2011-03-12 11:06 ` Marek Vasut
2011-03-12 11:30 ` Vasily Khoruzhick
2011-03-12 13:16 ` Marek Vasut
2011-03-12 20:33 ` Vasily Khoruzhick
2011-03-12 20:35 ` Marek Vasut
2011-03-12 20:34 ` Vasily Khoruzhick
2011-03-12 22:29 ` Marek Vasut
2011-03-15 15:49 ` Eric Miao
2011-03-15 15:57 ` Vasily Khoruzhick
2011-03-15 16:42 ` Eric Miao
2011-03-15 20:11 ` [PATCH v2] " Vasily Khoruzhick
2011-07-05 6:58 ` Eric Miao [this message]
2011-03-15 14:41 ` [PATCH 5/8] " Pavel Machek
2011-03-11 10:23 ` [PATCH 6/8] ARM: PXA: Z2: Fix libertas init/tear down sequences Vasily Khoruzhick
2011-03-11 21:37 ` Marek Vasut
2011-03-11 21:41 ` Vasily Khoruzhick
2011-03-11 21:51 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 7/8] ARM: PXA: Z2: Keep kbd backlight disabled by default Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 8/8] ARM: PXA: Z2: Add default triggers for LEDs Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 21:43 ` [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Marek Vasut
2011-03-13 10:15 ` Pavel Machek
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=CAMPhdO97oQETeu5hiiVsxpAS5BC6up7SkLYceAB3Ag+AwJLYtQ@mail.gmail.com \
--to=eric.y.miao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).