From patchwork Fri Feb  4 14:21:43 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: tip-bot for Dave Martin <dave.martin@linaro.org>
X-Patchwork-Id: 531931
X-Patchwork-Delegate: khilman@deeprootsystems.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p14EMBOn003630
	for <patchwork-omap@patchwork.kernel.org>;
	Fri, 4 Feb 2011 14:22:11 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752470Ab1BDOWK (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Fri, 4 Feb 2011 09:22:10 -0500
Received: from mail-wy0-f174.google.com ([74.125.82.174]:49122 "EHLO
	mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751857Ab1BDOWJ (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Fri, 4 Feb 2011 09:22:09 -0500
Received: by mail-wy0-f174.google.com with SMTP id 28so2295541wyb.19
	for <linux-omap@vger.kernel.org>;
	Fri, 04 Feb 2011 06:22:08 -0800 (PST)
Received: by 10.227.143.138 with SMTP id v10mr12257991wbu.24.1296829328471;
	Fri, 04 Feb 2011 06:22:08 -0800 (PST)
Received: from e200948.cambridge.arm.com
	(host86-160-160-30.range86-160.btcentralplus.com [86.160.160.30])
	by mx.google.com with ESMTPS id o6sm550240wbo.21.2011.02.04.06.22.06
	(version=SSLv3 cipher=RC4-MD5);
	Fri, 04 Feb 2011 06:22:08 -0800 (PST)
From: Dave Martin <dave.martin@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Cc: Dave Martin <dave.martin@linaro.org>, Tony Lindgren <tony@atomide.com>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Jean Pihet <j-pihet@ti.com>, linux-omap@vger.kernel.org,
	Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: [PATCH v3 1/5] ARM: omap4: Replace custom do_wfi() with generic
	wfi()
Date: Fri,  4 Feb 2011 14:21:43 +0000
Message-Id: <1296829307-21439-2-git-send-email-dave.martin@linaro.org>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1296829307-21439-1-git-send-email-dave.martin@linaro.org>
References: <1296829307-21439-1-git-send-email-dave.martin@linaro.org>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 04 Feb 2011 14:22:12 +0000 (UTC)


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;
 }