MX3X: Add Keypad device definition for MX3X arch
Subsystems (2)
PATCH 1/2 MX3X: Add Keypad device definition for MX3X arch
---
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(-)
arch/arm/mach-mx3/devices.c +19 -0
@@ -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 ()) {
arch/arm/mach-mx3/devices.h +1 -0
@@ -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;
Signature · 1 line
1.6.3.3
PATCH 2/2 mx31_3ds: Support the keypad situated in the personality board
---
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(-)
arch/arm/mach-mx3/mach-mx31_3ds.c +32 -0
@@ -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);
Signature · 1 line
1.6.3.3
PATCH 2/2 mx31_3ds: Support the keypad situated in the personality board
Hi Alberto,
Quoted 25 lines · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>---
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(-)arch/arm/mach-mx3/mach-mx31_3ds.c +1
-0@@ -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,
arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 94
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +9
-0MX31_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
Signature · 4 lines
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 |
PATCH 2/2 mx31_3ds: Support the keypad situated in the personality board
Quoted 41 lines · MXC Sascha Hauer
Hi Alberto,
Quoted 25 lines · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>---
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(-)arch/arm/mach-mx3/mach-mx31_3ds.c +1
-0@@ -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,arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 94
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +9
-0MX31_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.hand use them?
Quoted 2 lines
Sascha
Well, that should be in the platform patch right?
Soon a new version.
Signature · 4 lines
Alberto!
Be Persistent!
- Greg Kroah-Hartman (FOSDEM 2010)