From patchwork Fri Sep  3 22:28:10 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Mark F. Brown" <mark.brown314@gmail.com>
X-Patchwork-Id: 155211
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 o83MUxJ1008100
	for <patchwork-linux-input@patchwork.kernel.org>;
	Fri, 3 Sep 2010 22:30:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753847Ab0ICWa0 (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Fri, 3 Sep 2010 18:30:26 -0400
Received: from mail-qw0-f46.google.com ([209.85.216.46]:51358 "EHLO
	mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754800Ab0ICW3v (ORCPT
	<rfc822; linux-input@vger.kernel.org>); Fri, 3 Sep 2010 18:29:51 -0400
Received: by qwh6 with SMTP id 6so2253930qwh.19
	for <multiple recipients>; Fri, 03 Sep 2010 15:29:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer:in-reply-to:references;
	bh=RuUJGCTP4L9DHNLClQJPRlahjY7b+5j8MakRPL1XzgY=;
	b=pQtg+JFohA7OgXC9OwIyXlYnD9VUviVS4OqlDBAn2YOx1Cgdj9JA0qf4vLib1oJsGY
	+L3PrhgIFfmuoh0b0h1nes1kMTObs6Sd5qpx7HPPRkMxn69KLJSz93CbpXCeg7ZCBsOF
	3DF7e7mVVg+Pm4XP2579UiuC3AZQWiqAu+C7w=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
	b=KjO/TjWW7ZjqKI2LONB0YekzaZmzVuSg9Qr+HqbjmTXD+fTkmDAA9yf9cl6aZKtG01
	X+t+3+MawU4HX4cF2bbCgXfpiRgJn3ARDkQS1NNOP70j2rrDqQuSUckFqS8fBnYDFi/V
	MH6VR3N3ZSg/mSoJdsSpDlfomBTTKct4yTN34=
Received: by 10.229.71.69 with SMTP id g5mr787194qcj.176.1283552990569;
	Fri, 03 Sep 2010 15:29:50 -0700 (PDT)
Received: from localhost.localdomain
	(pool-173-48-128-43.bstnma.fios.verizon.net [173.48.128.43])
	by mx.google.com with ESMTPS id
	l13sm2505227qck.19.2010.09.03.15.29.49
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Fri, 03 Sep 2010 15:29:50 -0700 (PDT)
From: "Mark F. Brown" <mark.brown314@gmail.com>
To: Eric Miao <eric.y.miao@gmail.com>,
	Haojian Zhuang <haojian.zhuang@marvell.com>,
	"Mark F. Brown" <mark.brown314@gmail.com>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Cc: "Mark F. Brown" <mark.brown314@gmail.com>
Subject: [PATCH v2 5/6 RESEND] ARM: pxa168: added keypad wake clear event
	support for platform
Date: Fri,  3 Sep 2010 18:28:10 -0400
Message-Id: <1283552891-13966-6-git-send-email-mark.brown314@gmail.com>
X-Mailer: git-send-email 1.7.0.4
In-Reply-To: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com>
References: <1283552891-13966-1-git-send-email-mark.brown314@gmail.com>
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 03 Sep 2010 22:30:59 +0000 (UTC)


diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h
index f34e663..1801e42 100644
--- a/arch/arm/mach-mmp/include/mach/pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/pxa168.h
@@ -5,6 +5,7 @@ struct sys_timer;
 
 extern struct sys_timer pxa168_timer;
 extern void __init pxa168_init_irq(void);
+extern void pxa168_clear_keypad_wakeup(void);
 
 #include <linux/i2c.h>
 #include <mach/devices.h>
@@ -12,6 +13,7 @@ extern void __init pxa168_init_irq(void);
 #include <plat/pxa3xx_nand.h>
 #include <video/pxa168fb.h>
 #include <plat/pxa27x_keypad.h>
+#include <mach/cputype.h>
 
 extern struct pxa_device_desc pxa168_device_uart1;
 extern struct pxa_device_desc pxa168_device_uart2;
@@ -109,6 +111,9 @@ static inline int pxa168_add_fb(struct pxa168fb_mach_info *mi)
 
 static inline int pxa168_add_keypad(struct pxa27x_keypad_platform_data *data)
 {
+	if (cpu_is_pxa168())
+		data->clear_wakeup_event = pxa168_clear_keypad_wakeup;
+
 	return pxa_register_device(&pxa168_device_keypad, data, sizeof(*data));
 }
 
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index 2fa16fb..72b4e76 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -136,6 +136,16 @@ struct sys_timer pxa168_timer = {
 	.init	= pxa168_timer_init,
 };
 
+void pxa168_clear_keypad_wakeup(void)
+{
+	uint32_t val;
+	uint32_t mask = APMU_PXA168_KP_WAKE_CLR;
+
+	/* wake event clear is needed in order to clear keypad interrupt */
+	val = __raw_readl(APMU_WAKE_CLR);
+	__raw_writel(val |  mask, APMU_WAKE_CLR);
+}
+
 /* on-chip devices */
 PXA168_DEVICE(uart1, "pxa2xx-uart", 0, UART1, 0xd4017000, 0x30, 21, 22);
 PXA168_DEVICE(uart2, "pxa2xx-uart", 1, UART2, 0xd4018000, 0x30, 23, 24);