From patchwork Tue Feb  8 11:01:25 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: 540221
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 p18B1cnb010639
	for <patchwork-omap@patchwork.kernel.org>;
	Tue, 8 Feb 2011 11:01:40 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753275Ab1BHLBg (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Tue, 8 Feb 2011 06:01:36 -0500
Received: from mail-ww0-f44.google.com ([74.125.82.44]:52314 "EHLO
	mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753151Ab1BHLBf (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Tue, 8 Feb 2011 06:01:35 -0500
Received: by wwa36 with SMTP id 36so5877940wwa.1
	for <linux-omap@vger.kernel.org>;
	Tue, 08 Feb 2011 03:01:34 -0800 (PST)
Received: by 10.227.156.71 with SMTP id v7mr11745162wbw.101.1297162894212;
	Tue, 08 Feb 2011 03:01:34 -0800 (PST)
Received: from e200948.cambridge.arm.com
	(host86-160-160-87.range86-160.btcentralplus.com [86.160.160.87])
	by mx.google.com with ESMTPS id w25sm4301694wbd.5.2011.02.08.03.01.32
	(version=SSLv3 cipher=RC4-MD5);
	Tue, 08 Feb 2011 03:01:33 -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>,
	Russell King <linux@arm.linux.org.uk>
Subject: [PATCH v2] ARM: Define wfi() macro for v6 processors
Date: Tue,  8 Feb 2011 11:01:25 +0000
Message-Id: <1297162885-2975-1-git-send-email-dave.martin@linaro.org>
X-Mailer: git-send-email 1.7.1
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]);
	Tue, 08 Feb 2011 11:01:41 +0000 (UTC)


diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
index 97f6d60..f39cf09 100644
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
@@ -129,6 +129,9 @@ extern unsigned int user_debug;
 #define sev()	__asm__ __volatile__ ("sev" : : : "memory")
 #define wfe()	__asm__ __volatile__ ("wfe" : : : "memory")
 #define wfi()	__asm__ __volatile__ ("wfi" : : : "memory")
+#elif __LINUX_ARM_ARCH__ == 6
+#define wfi() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c0, 4" \
+				    : : "r" (0) : "memory")
 #endif
 
 #if __LINUX_ARM_ARCH__ >= 7