* [PATCH 1/2] MX3X: Add Keypad device definition for MX3X arch
@ 2010-05-17 18:14 Alberto Panizzo
2010-05-17 18:20 ` [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board Alberto Panizzo
0 siblings, 1 reply; 4+ messages in thread
From: Alberto Panizzo @ 2010-05-17 18:14 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
---
This patch is against the today mxc-master HEAD
arch/arm/mach-mx3/devices.c | 19 +++++++++++++++++++
arch/arm/mach-mx3/devices.h | 1 +
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
index 1ffed28..57b0541 100644
--- a/arch/arm/mach-mx3/devices.c
+++ b/arch/arm/mach-mx3/devices.c
@@ -607,6 +607,25 @@ struct platform_device imx_rtc_device0 = {
.resource = imx_rtc_resources,
};
+static struct resource imx_kpp_resources[] = {
+ {
+ .start = MX3x_KPP_BASE_ADDR,
+ .end = MX3x_KPP_BASE_ADDR + 0xf,
+ .flags = IORESOURCE_MEM
+ }, {
+ .start = MX3x_INT_KPP,
+ .end = MX3x_INT_KPP,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+struct platform_device imx_kpp_device = {
+ .name = "imx-keypad",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(imx_kpp_resources),
+ .resource = imx_kpp_resources,
+};
+
static int __init mx3_devices_init(void)
{
if (cpu_is_mx31()) {
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
index b1687ad..2c3c864 100644
--- a/arch/arm/mach-mx3/devices.h
+++ b/arch/arm/mach-mx3/devices.h
@@ -28,3 +28,4 @@ extern struct platform_device imx_ssi_device1;
extern struct platform_device imx_ssi_device1;
extern struct platform_device imx_wdt_device0;
extern struct platform_device imx_rtc_device0;
+extern struct platform_device imx_kpp_device;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board
2010-05-17 18:14 [PATCH 1/2] MX3X: Add Keypad device definition for MX3X arch Alberto Panizzo
@ 2010-05-17 18:20 ` Alberto Panizzo
2010-05-18 8:45 ` MXC Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: Alberto Panizzo @ 2010-05-17 18:20 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
---
this patch is built over the today mxc-master branch
arch/arm/mach-mx3/mach-mx31_3ds.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
index 55d6117..745675b 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
@@ -28,6 +28,7 @@
#include <linux/spi/spi.h>
#include <linux/regulator/machine.h>
#include <linux/fsl_devices.h>
+#include <linux/input/matrix_keypad.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
@@ -82,6 +83,35 @@ static int mx31_3ds_pins[] = {
MX31_PIN_USBOTG_DIR__USBOTG_DIR,
MX31_PIN_USBOTG_NXT__USBOTG_NXT,
MX31_PIN_USBOTG_STP__USBOTG_STP,
+ /*Keyboard*/
+ IOMUX_MODE(MX31_PIN_KEY_ROW0, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_ROW1, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_ROW2, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_COL0, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_COL1, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_COL2, IOMUX_CONFIG_FUNC),
+ IOMUX_MODE(MX31_PIN_KEY_COL3, IOMUX_CONFIG_FUNC),
+};
+
+/*
+ * Matrix keyboard
+ */
+
+static const uint32_t mx31_3ds_keymap[] = {
+ KEY(0, 0, KEY_UP),
+ KEY(0, 1, KEY_DOWN),
+ KEY(1, 0, KEY_RIGHT),
+ KEY(1, 1, KEY_LEFT),
+ KEY(1, 2, KEY_ENTER),
+ KEY(2, 0, KEY_F6),
+ KEY(2, 1, KEY_F8),
+ KEY(2, 2, KEY_F9),
+ KEY(2, 3, KEY_F10),
+};
+
+static struct matrix_keymap_data mx31_3ds_keymap_data = {
+ .keymap = mx31_3ds_keymap,
+ .keymap_size = ARRAY_SIZE(mx31_3ds_keymap),
};
/* Regulators */
@@ -367,6 +397,8 @@ static void __init mxc_board_init(void)
spi_register_board_info(mx31_3ds_spi_devs,
ARRAY_SIZE(mx31_3ds_spi_devs));
+ mxc_register_device(&imx_kpp_device, &mx31_3ds_keymap_data);
+
mx31_3ds_usbotg_init();
mxc_register_device(&mxc_otg_udc_device, &usbotg_pdata);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board
2010-05-17 18:20 ` [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board Alberto Panizzo
@ 2010-05-18 8:45 ` MXC Sascha Hauer
2010-05-19 8:58 ` Alberto Panizzo
0 siblings, 1 reply; 4+ messages in thread
From: MXC Sascha Hauer @ 2010-05-18 8:45 UTC (permalink / raw)
To: linux-arm-kernel
Hi Alberto,
On Mon, May 17, 2010 at 08:20:14PM +0200, Alberto Panizzo wrote:
>
>
> Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
> ---
>
> this patch is built over the today mxc-master branch
>
> arch/arm/mach-mx3/mach-mx31_3ds.c | 32 ++++++++++++++++++++++++++++++++
> 1 files changed, 32 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
> index 55d6117..745675b 100644
> --- a/arch/arm/mach-mx3/mach-mx31_3ds.c
> +++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
> @@ -28,6 +28,7 @@
> #include <linux/spi/spi.h>
> #include <linux/regulator/machine.h>
> #include <linux/fsl_devices.h>
> +#include <linux/input/matrix_keypad.h>
>
> #include <mach/hardware.h>
> #include <asm/mach-types.h>
> @@ -82,6 +83,35 @@ static int mx31_3ds_pins[] = {
> MX31_PIN_USBOTG_DIR__USBOTG_DIR,
> MX31_PIN_USBOTG_NXT__USBOTG_NXT,
> MX31_PIN_USBOTG_STP__USBOTG_STP,
> + /*Keyboard*/
> + IOMUX_MODE(MX31_PIN_KEY_ROW0, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_ROW1, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_ROW2, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_COL0, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_COL1, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_COL2, IOMUX_CONFIG_FUNC),
> + IOMUX_MODE(MX31_PIN_KEY_COL3, IOMUX_CONFIG_FUNC),
> +};
Care to add these values to iomux-mx3.h and use them?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board
2010-05-18 8:45 ` MXC Sascha Hauer
@ 2010-05-19 8:58 ` Alberto Panizzo
0 siblings, 0 replies; 4+ messages in thread
From: Alberto Panizzo @ 2010-05-19 8:58 UTC (permalink / raw)
To: linux-arm-kernel
On mar, 2010-05-18 at 10:45 +0200, MXC Sascha Hauer wrote:
> Hi Alberto,
>
> On Mon, May 17, 2010 at 08:20:14PM +0200, Alberto Panizzo wrote:
> >
> >
> > Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
> > ---
> >
> > this patch is built over the today mxc-master branch
> >
> > arch/arm/mach-mx3/mach-mx31_3ds.c | 32 ++++++++++++++++++++++++++++++++
> > 1 files changed, 32 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-mx3/mach-mx31_3ds.c
> > index 55d6117..745675b 100644
> > --- a/arch/arm/mach-mx3/mach-mx31_3ds.c
> > +++ b/arch/arm/mach-mx3/mach-mx31_3ds.c
> > @@ -28,6 +28,7 @@
> > #include <linux/spi/spi.h>
> > #include <linux/regulator/machine.h>
> > #include <linux/fsl_devices.h>
> > +#include <linux/input/matrix_keypad.h>
> >
> > #include <mach/hardware.h>
> > #include <asm/mach-types.h>
> > @@ -82,6 +83,35 @@ static int mx31_3ds_pins[] = {
> > MX31_PIN_USBOTG_DIR__USBOTG_DIR,
> > MX31_PIN_USBOTG_NXT__USBOTG_NXT,
> > MX31_PIN_USBOTG_STP__USBOTG_STP,
> > + /*Keyboard*/
> > + IOMUX_MODE(MX31_PIN_KEY_ROW0, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_ROW1, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_ROW2, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_COL0, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_COL1, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_COL2, IOMUX_CONFIG_FUNC),
> > + IOMUX_MODE(MX31_PIN_KEY_COL3, IOMUX_CONFIG_FUNC),
> > +};
>
> Care to add these values to iomux-mx3.h and use them?
>
> Sascha
>
Well, that should be in the platform patch right?
Soon a new version.
--
Alberto!
Be Persistent!
- Greg Kroah-Hartman (FOSDEM 2010)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-19 8:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 18:14 [PATCH 1/2] MX3X: Add Keypad device definition for MX3X arch Alberto Panizzo
2010-05-17 18:20 ` [PATCH 2/2] mx31_3ds: Support the keypad situated in the personality board Alberto Panizzo
2010-05-18 8:45 ` MXC Sascha Hauer
2010-05-19 8:58 ` Alberto Panizzo
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).