From: Alexander Graf <agraf@suse.de>
To: linuxppc-dev@lists.ozlabs.org
Cc: arnd@arndb.de, geoff@infradead.org, alistair@popple.id.au,
scottwood@freescale.com, agust@denx.de, linux@roeck-us.net
Subject: [PATCH v2 02/20] powerpc/xmon: Support either ppc_md.power_off or pm_power_off
Date: Mon, 13 Oct 2014 16:01:10 +0200 [thread overview]
Message-ID: <1413208888-49211-3-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1413208888-49211-1-git-send-email-agraf@suse.de>
Xmon can manually turn off the machine. We now have 2 code paths for this:
1) ppc_md.power_off
2) pm_power_off
This patch allows xmon to support both and makes sure it graciously allows
a path to not be implemented.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/xmon/xmon.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index b988b5a..531f649 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -981,7 +981,10 @@ static void bootcmds(void)
else if (cmd == 'h')
ppc_md.halt();
else if (cmd == 'p')
- ppc_md.power_off();
+ if (ppc_md.power_off)
+ ppc_md.power_off();
+ if (pm_power_off)
+ pm_power_off();
}
static int cpu_cmd(void)
--
1.8.1.4
next prev parent reply other threads:[~2014-10-13 14:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-13 14:01 [PATCH v2 00/20] powerpc: Convert power off logic to pm_power_off Alexander Graf
2014-10-13 14:01 ` [PATCH v2 01/20] powerpc: Support override of pm_power_off Alexander Graf
2014-10-13 14:01 ` Alexander Graf [this message]
2014-10-13 14:01 ` [PATCH v2 03/20] powerpc/47x: Use pm_power_off rather than ppc_md.power_off Alexander Graf
2014-10-13 14:01 ` [PATCH v2 04/20] powerpc/52xx/efika: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 05/20] powerpc/mpc8349emitx: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 06/20] powerpc/corenet: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 07/20] powerpc/85xx/sgy_cts1000: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 08/20] powerpc/celleb: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 09/20] powerpc/cell/qpace: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 10/20] powerpc/cell: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 11/20] powerpc/chrp: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 12/20] powerpc/6xx/gamecube: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 13/20] powerpc/6xx/linkstation: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 14/20] powerpc/6xx/wii: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 15/20] powerpc/maple: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 16/20] powerpc/powermac: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 17/20] powerpc/powernv: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 18/20] powerpc/ps3: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 19/20] powerpc/pseries: " Alexander Graf
2014-10-13 14:01 ` [PATCH v2 20/20] powerpc: Remove ppc_md.power_off Alexander Graf
2014-10-13 15:47 ` [PATCH v2 00/20] powerpc: Convert power off logic to pm_power_off Guenter Roeck
2014-10-13 15:54 ` Guenter Roeck
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=1413208888-49211-3-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=agust@denx.de \
--cc=alistair@popple.id.au \
--cc=arnd@arndb.de \
--cc=geoff@infradead.org \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=scottwood@freescale.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).