All of lore.kernel.org
 help / color / mirror / Atom feed
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 6/6] ARM: pxa168: aspenite: add board support for keypad
Date: Thu, 26 Aug 2010 11:27:37 -0400	[thread overview]
Message-ID: <1282836457-5651-7-git-send-email-mark.brown314@gmail.com> (raw)
In-Reply-To: <1282836457-5651-1-git-send-email-mark.brown314@gmail.com>

Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
---
 arch/arm/mach-mmp/aspenite.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 9e1bd6b..f04bae6 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -24,6 +24,8 @@
 #include <mach/pxa168.h>
 #include <mach/gpio.h>
 #include <video/pxa168fb.h>
+#include <linux/input.h>
+#include <plat/pxa27x_keypad.h>
 
 #include "common.h"
 
@@ -97,6 +99,13 @@ static unsigned long common_pin_config[] __initdata = {
 	GPIO81_LCD_DD21,
 	GPIO82_LCD_DD22,
 	GPIO83_LCD_DD23,
+
+	/* Keypad */
+	GPIO109_KP_MKIN1,
+	GPIO110_KP_MKIN0,
+	GPIO111_KP_MKOUT7,
+	GPIO112_KP_MKOUT6,
+	GPIO121_KP_MKIN4,
 };
 
 static struct smc91x_platdata smc91x_info = {
@@ -193,6 +202,23 @@ struct pxa168fb_mach_info aspenite_lcd_info = {
 	.invert_pixclock	= 0,
 };
 
+static unsigned int aspenite_matrix_key_map[] = {
+	KEY(0, 6, KEY_UP),	/* SW 4 */
+	KEY(0, 7, KEY_DOWN),	/* SW 5 */
+	KEY(1, 6, KEY_LEFT),	/* SW 6 */
+	KEY(1, 7, KEY_RIGHT),	/* SW 7 */
+	KEY(4, 6, KEY_ENTER),	/* SW 8 */
+	KEY(4, 7, KEY_ESC),	/* SW 9 */
+};
+
+static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {
+	.matrix_key_rows	= 5,
+	.matrix_key_cols	= 8,
+	.matrix_key_map		= aspenite_matrix_key_map,
+	.matrix_key_map_size	= ARRAY_SIZE(aspenite_matrix_key_map),
+	.debounce_interval	= 30,
+};
+
 static void __init common_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(common_pin_config));
@@ -203,6 +229,7 @@ static void __init common_init(void)
 	pxa168_add_ssp(1);
 	pxa168_add_nand(&aspenite_nand_info);
 	pxa168_add_fb(&aspenite_lcd_info);
+	pxa168_add_keypad(&aspenite_keypad_info);
 
 	/* off-chip devices */
 	platform_device_register(&smc91x_device);
-- 
1.7.0.4


WARNING: multiple messages have this Message-ID (diff)
From: mark.brown314@gmail.com (Mark F. Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 6/6] ARM: pxa168: aspenite: add board support for keypad
Date: Thu, 26 Aug 2010 11:27:37 -0400	[thread overview]
Message-ID: <1282836457-5651-7-git-send-email-mark.brown314@gmail.com> (raw)
In-Reply-To: <1282836457-5651-1-git-send-email-mark.brown314@gmail.com>

Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
---
 arch/arm/mach-mmp/aspenite.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 9e1bd6b..f04bae6 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -24,6 +24,8 @@
 #include <mach/pxa168.h>
 #include <mach/gpio.h>
 #include <video/pxa168fb.h>
+#include <linux/input.h>
+#include <plat/pxa27x_keypad.h>
 
 #include "common.h"
 
@@ -97,6 +99,13 @@ static unsigned long common_pin_config[] __initdata = {
 	GPIO81_LCD_DD21,
 	GPIO82_LCD_DD22,
 	GPIO83_LCD_DD23,
+
+	/* Keypad */
+	GPIO109_KP_MKIN1,
+	GPIO110_KP_MKIN0,
+	GPIO111_KP_MKOUT7,
+	GPIO112_KP_MKOUT6,
+	GPIO121_KP_MKIN4,
 };
 
 static struct smc91x_platdata smc91x_info = {
@@ -193,6 +202,23 @@ struct pxa168fb_mach_info aspenite_lcd_info = {
 	.invert_pixclock	= 0,
 };
 
+static unsigned int aspenite_matrix_key_map[] = {
+	KEY(0, 6, KEY_UP),	/* SW 4 */
+	KEY(0, 7, KEY_DOWN),	/* SW 5 */
+	KEY(1, 6, KEY_LEFT),	/* SW 6 */
+	KEY(1, 7, KEY_RIGHT),	/* SW 7 */
+	KEY(4, 6, KEY_ENTER),	/* SW 8 */
+	KEY(4, 7, KEY_ESC),	/* SW 9 */
+};
+
+static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {
+	.matrix_key_rows	= 5,
+	.matrix_key_cols	= 8,
+	.matrix_key_map		= aspenite_matrix_key_map,
+	.matrix_key_map_size	= ARRAY_SIZE(aspenite_matrix_key_map),
+	.debounce_interval	= 30,
+};
+
 static void __init common_init(void)
 {
 	mfp_config(ARRAY_AND_SIZE(common_pin_config));
@@ -203,6 +229,7 @@ static void __init common_init(void)
 	pxa168_add_ssp(1);
 	pxa168_add_nand(&aspenite_nand_info);
 	pxa168_add_fb(&aspenite_lcd_info);
+	pxa168_add_keypad(&aspenite_keypad_info);
 
 	/* off-chip devices */
 	platform_device_register(&smc91x_device);
-- 
1.7.0.4

  parent reply	other threads:[~2010-09-03 21:49 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-26 15:27 [PATCH v2 0/6] ARM: pxa168: add keypad support Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27 ` [PATCH v2 1/6] ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to platform pxa directory Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-09-04  2:11   ` Marek Vasut
2010-09-04  2:11     ` Marek Vasut
2010-09-04  2:11     ` Marek Vasut
2010-08-26 15:27 ` [PATCH v2 2/6] ARM: pxa168: added keypad support Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27 ` [PATCH v2 3/6] ARM: pxa168: added wake clear register support for APMU Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-08-26 15:27 ` [PATCH v2 4/6] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown
2010-08-26 15:27 ` [PATCH v2 5/6] ARM: pxa168: added keypad wake clear event support for platform Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-08-26 15:27   ` Mark F. Brown
2010-08-26 15:27 ` [PATCH v2 6/6] ARM: pxa168: aspenite: add board support for keypad Mark F. Brown
2010-08-26 15:27 ` Mark F. Brown [this message]
2010-08-26 15:27   ` Mark F. Brown
2010-09-04  2:12   ` Marek Vasut
2010-09-04  2:12     ` Marek Vasut
2010-09-04  2:12     ` Marek Vasut
2010-09-04  2:56     ` Mark F. Brown
2010-09-04  2:56       ` Mark F. Brown
2010-09-04  2:56       ` Mark F. Brown
2010-09-04  5:23       ` Marek Vasut
2010-09-04  5:23         ` Marek Vasut
2010-09-04  5:23         ` Marek Vasut
2010-09-03 21:52 ` [PATCH v2 0/6] ARM: pxa168: add keypad support David Miller
2010-09-03 21:52   ` David Miller
2010-09-03 22:06   ` Mark F. Brown
2010-09-03 22:06     ` Mark F. Brown

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=1282836457-5651-7-git-send-email-mark.brown314@gmail.com \
    --to=mark.brown314@gmail.com \
    --cc=eric.y.miao@gmail.com \
    --cc=haojian.zhuang@marvell.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.