From: dave.martin@linaro.org (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/5] ARM: omap4: Replace custom do_wfi() with generic wfi()
Date: Fri, 4 Feb 2011 14:21:43 +0000 [thread overview]
Message-ID: <1296829307-21439-2-git-send-email-dave.martin@linaro.org> (raw)
In-Reply-To: <1296829307-21439-1-git-send-email-dave.martin@linaro.org>
Now that wfi() in <asm/system.h> is suitably generic, we can
remove the omap-specific do_wfi() macro.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
---
arch/arm/mach-omap2/include/mach/omap4-common.h | 7 -------
arch/arm/mach-omap2/omap-hotplug.c | 3 ++-
arch/arm/mach-omap2/pm44xx.c | 3 ++-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h
index 5b0270b..b2ac175 100644
--- a/arch/arm/mach-omap2/include/mach/omap4-common.h
+++ b/arch/arm/mach-omap2/include/mach/omap4-common.h
@@ -13,13 +13,6 @@
#ifndef OMAP_ARCH_OMAP4_COMMON_H
#define OMAP_ARCH_OMAP4_COMMON_H
-/*
- * wfi used in low power code. Directly opcode is used instead
- * of instruction to avoid mulit-omap build break
- */
-#define do_wfi() \
- __asm__ __volatile__ (".word 0xe320f003" : : : "memory")
-
#ifdef CONFIG_CACHE_L2X0
extern void __iomem *l2cache_base;
#endif
diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index 4976b93..c983e1d 100644
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -19,6 +19,7 @@
#include <linux/smp.h>
#include <asm/cacheflush.h>
+#include <asm/system.h>
#include <mach/omap4-common.h>
int platform_cpu_kill(unsigned int cpu)
@@ -45,7 +46,7 @@ void platform_cpu_die(unsigned int cpu)
/*
* Execute WFI
*/
- do_wfi();
+ wfi();
if (omap_read_auxcoreboot0() == cpu) {
/*
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 76cfff2..9e454b6 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -16,6 +16,7 @@
#include <linux/err.h>
#include <linux/slab.h>
+#include <asm/system.h>
#include "powerdomain.h"
#include <mach/omap4-common.h>
@@ -33,7 +34,7 @@ static LIST_HEAD(pwrst_list);
#ifdef CONFIG_SUSPEND
static int omap4_pm_suspend(void)
{
- do_wfi();
+ wfi();
return 0;
}
--
1.7.1
next prev parent reply other threads:[~2011-02-04 14:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-04 14:21 [PATCH v3 0/5] ARM: omap[34]: Thumb-2 compatibility fixes Dave Martin
2011-02-04 14:21 ` Dave Martin [this message]
2011-02-04 14:21 ` [PATCH v3 2/5] ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL Dave Martin
2011-02-04 14:21 ` [PATCH v3 3/5] ARM: omap3: Remove hand-encoded SMC instructions Dave Martin
2011-02-04 14:58 ` Santosh Shilimkar
2011-02-04 15:00 ` Dave Martin
2011-02-04 14:21 ` [PATCH v3 4/5] ARM: omap3: Thumb-2 compatibility for sram34xx.S Dave Martin
2011-02-04 14:21 ` [PATCH v3 5/5] ARM: omap3: Thumb-2 compatibility for sleep34xx.S Dave Martin
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=1296829307-21439-2-git-send-email-dave.martin@linaro.org \
--to=dave.martin@linaro.org \
--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).