ARM: pxa168: add keypad support
Subsystems (6)
v2 cover ARM: pxa168: add keypad support
Version 1
1) Make pxa27x_keypad.h accessible to mach-mmp
2) Add a wakeup handler for pxa27x_keypad interrupts
The wakeup callback fixes an issue on the pxa168 that prevents the keypad driver from being able to clear the keypad interrupt after reading KPC_PC
3) Add initial board level support
Version 2
1) Clean up for wakeup handler moved from pxa168-irq to pxa27x_keypad
2) Reduced the number of rows to 5 for Aspenite
Resend
1) System time was wrong when email was sent
Mark F. Brown (6):
ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to platform pxa directory
ARM: pxa168: added keypad support
ARM: pxa168: added wake clear register support for APMU
ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
ARM: pxa168: added keypad wake clear event support for platform
ARM: pxa168: aspenite: add board support for keypad
arch/arm/mach-mmp/aspenite.c | 27 ++++++++++++++++++++
arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 7 +++++
arch/arm/mach-mmp/include/mach/pxa168.h | 12 +++++++++
arch/arm/mach-mmp/include/mach/regs-apmu.h | 12 +++++++++
arch/arm/mach-mmp/pxa168.c | 13 +++++++++
arch/arm/mach-pxa/devices.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 2 +-
arch/arm/mach-pxa/ezx.c | 2 +-
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 4 +-
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmld.c | 2 +-
arch/arm/mach-pxa/palmt5.c | 2 +-
arch/arm/mach-pxa/palmtreo.c | 2 +-
arch/arm/mach-pxa/palmtx.c | 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 2 +-
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-pxa/zylonite.c | 2 +-
.../mach => plat-pxa/include/plat}/pxa27x_keypad.h | 1 +
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/keyboard/pxa27x_keypad.c | 12 ++++++++-
22 files changed, 99 insertions(+), 17 deletions(-)
rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/pxa27x_keypad.h (97%)PATCH RESEND v2 1/6 ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to platform pxa directory
mach-mmp utilizes pxa27x_keypad code so we need to move header to platform pxa directory.
---
arch/arm/mach-pxa/devices.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 2 +-
arch/arm/mach-pxa/ezx.c | 2 +-
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 4 ++--
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmld.c | 2 +-
arch/arm/mach-pxa/palmt5.c | 2 +-
arch/arm/mach-pxa/palmtreo.c | 2 +-
arch/arm/mach-pxa/palmtx.c | 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 2 +-
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-pxa/zylonite.c | 2 +-
.../mach => plat-pxa/include/plat}/pxa27x_keypad.h | 0
drivers/input/keyboard/pxa27x_keypad.c | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/pxa27x_keypad.h (100%)arch/arm/mach-pxa/devices.c +1 -1
@@ -11,7 +11,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxa2xx_spi.h> #include <mach/camera.h> #include <mach/audio.h>
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -43,7 +43,7 @@#include <mach/pxafb.h> #include <mach/ohci.h> #include <mach/mmc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <plat/i2c.h> #include <mach/camera.h> #include <mach/pxa2xx_spi.h>
arch/arm/mach-pxa/ezx.c +1 -1
@@ -32,7 +32,7 @@#include <mach/ohci.h> #include <plat/i2c.h> #include <mach/hardware.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/camera.h> #include "devices.h"
arch/arm/mach-pxa/littleton.c +1 -1
@@ -43,7 +43,7 @@#include <mach/pxafb.h> #include <mach/mmc.h> #include <mach/pxa2xx_spi.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/littleton.h> #include <plat/i2c.h> #include <plat/pxa3xx_nand.h>
arch/arm/mach-pxa/mainstone.c +2 -2
@@ -41,7 +41,7 @@#include <asm/mach/irq.h> #include <asm/mach/flash.h> -#include <mach/pxa27x.h> +#include <plat/pxa27x.h> #include <mach/gpio.h> #include <mach/mainstone.h> #include <mach/audio.h>
@@ -50,7 +50,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include "generic.h" #include "devices.h"
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -45,7 +45,7 @@#include <mach/pxa27x.h> #include <mach/regs-rtc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxafb.h> #include <mach/mmc.h> #include <mach/udc.h>
arch/arm/mach-pxa/palmld.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmt5.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmtreo.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/ohci.h> #include <mach/pxa2xx-regs.h>
arch/arm/mach-pxa/palmtx.c +1 -1
@@ -43,7 +43,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -41,7 +41,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/tavorevb.c +1 -1
@@ -25,7 +25,7 @@#include <mach/pxa930.h> #include <mach/pxafb.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include "devices.h" #include "generic.h"
arch/arm/mach-pxa/z2.c +1 -1
@@ -37,7 +37,7 @@#include <mach/z2.h> #include <mach/pxafb.h> #include <mach/mmc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxa2xx_spi.h> #include <plat/i2c.h>
arch/arm/mach-pxa/zylonite.c +1 -1
@@ -30,7 +30,7 @@#include <mach/zylonite.h> #include <mach/mmc.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <plat/pxa3xx_nand.h> #include "devices.h"
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h renamed from arch/arm/mach-pxa/include/mach/pxa27x_keypad.h +0 -0
drivers/input/keyboard/pxa27x_keypad.c +1 -1
@@ -32,7 +32,7 @@#include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> /* * Keypad Controller registers */
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 1/6 RESEND] ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to platform pxa directory
Quoted 4 lines · Mark F. Brown
mach-mmp utilizes
pxa27x_keypadcode so we need to move header to platform pxa directory.Signed-off-by Mark F. Brown <[email protected]>
Applied to 'devel'.
PATCH RESEND v2 1/6 ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to platform pxa directory
In reply to Mark F. Brownmach-mmp utilizes pxa27x_keypad code so we need to move header to platform pxa directory.
---
arch/arm/mach-pxa/devices.c | 2 +-
arch/arm/mach-pxa/em-x270.c | 2 +-
arch/arm/mach-pxa/ezx.c | 2 +-
arch/arm/mach-pxa/littleton.c | 2 +-
arch/arm/mach-pxa/mainstone.c | 4 ++--
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmld.c | 2 +-
arch/arm/mach-pxa/palmt5.c | 2 +-
arch/arm/mach-pxa/palmtreo.c | 2 +-
arch/arm/mach-pxa/palmtx.c | 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/tavorevb.c | 2 +-
arch/arm/mach-pxa/z2.c | 2 +-
arch/arm/mach-pxa/zylonite.c | 2 +-
.../mach => plat-pxa/include/plat}/pxa27x_keypad.h | 0
drivers/input/keyboard/pxa27x_keypad.c | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/pxa27x_keypad.h (100%)arch/arm/mach-pxa/devices.c +1 -1
@@ -11,7 +11,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxa2xx_spi.h> #include <mach/camera.h> #include <mach/audio.h>
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -43,7 +43,7 @@#include <mach/pxafb.h> #include <mach/ohci.h> #include <mach/mmc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <plat/i2c.h> #include <mach/camera.h> #include <mach/pxa2xx_spi.h>
arch/arm/mach-pxa/ezx.c +1 -1
@@ -32,7 +32,7 @@#include <mach/ohci.h> #include <plat/i2c.h> #include <mach/hardware.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/camera.h> #include "devices.h"
arch/arm/mach-pxa/littleton.c +1 -1
@@ -43,7 +43,7 @@#include <mach/pxafb.h> #include <mach/mmc.h> #include <mach/pxa2xx_spi.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/littleton.h> #include <plat/i2c.h> #include <plat/pxa3xx_nand.h>
arch/arm/mach-pxa/mainstone.c +2 -2
@@ -41,7 +41,7 @@#include <asm/mach/irq.h> #include <asm/mach/flash.h> -#include <mach/pxa27x.h> +#include <plat/pxa27x.h> #include <mach/gpio.h> #include <mach/mainstone.h> #include <mach/audio.h>
@@ -50,7 +50,7 @@#include <mach/mmc.h> #include <mach/irda.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include "generic.h" #include "devices.h"
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -45,7 +45,7 @@#include <mach/pxa27x.h> #include <mach/regs-rtc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxafb.h> #include <mach/mmc.h> #include <mach/udc.h>
arch/arm/mach-pxa/palmld.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmt5.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmtreo.c +1 -1
@@ -39,7 +39,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/ohci.h> #include <mach/pxa2xx-regs.h>
arch/arm/mach-pxa/palmtx.c +1 -1
@@ -43,7 +43,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -41,7 +41,7 @@#include <mach/mmc.h> #include <mach/pxafb.h> #include <mach/irda.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/udc.h> #include <mach/palmasoc.h> #include <mach/palm27x.h>
arch/arm/mach-pxa/tavorevb.c +1 -1
@@ -25,7 +25,7 @@#include <mach/pxa930.h> #include <mach/pxafb.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include "devices.h" #include "generic.h"
arch/arm/mach-pxa/z2.c +1 -1
@@ -37,7 +37,7 @@#include <mach/z2.h> #include <mach/pxafb.h> #include <mach/mmc.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <mach/pxa2xx_spi.h> #include <plat/i2c.h>
arch/arm/mach-pxa/zylonite.c +1 -1
@@ -30,7 +30,7 @@#include <mach/zylonite.h> #include <mach/mmc.h> #include <mach/ohci.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> #include <plat/pxa3xx_nand.h> #include "devices.h"
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h renamed from arch/arm/mach-pxa/include/mach/pxa27x_keypad.h +0 -0
drivers/input/keyboard/pxa27x_keypad.c +1 -1
@@ -32,7 +32,7 @@#include <asm/mach/map.h> #include <mach/hardware.h> -#include <mach/pxa27x_keypad.h> +#include <plat/pxa27x_keypad.h> /* * Keypad Controller registers */
Signature · 1 line
1.7.0.4
PATCH RESEND v2 2/6 ARM: pxa168: added keypad support
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 7 +++++++ arch/arm/mach-mmp/include/mach/pxa168.h | 7 +++++++ arch/arm/mach-mmp/pxa168.c | 3 +++ drivers/input/keyboard/Kconfig | 2 +- 4 files changed, 18 insertions(+), 1 deletions(-)
arch/arm/mach-mmp/include/mach/mfp-pxa168.h +7 -0
@@ -289,4 +289,11 @@#define GPIO86_PWM1_OUT MFP_CFG(GPIO86, AF2)#define GPIO86_PWM2_OUT MFP_CFG(GPIO86, AF3) +/* Keypad */ +#define GPIO109_KP_MKIN1 MFP_CFG(GPIO109, AF7) +#define GPIO110_KP_MKIN0 MFP_CFG(GPIO110, AF7) +#define GPIO111_KP_MKOUT7 MFP_CFG(GPIO111, AF7) +#define GPIO112_KP_MKOUT6 MFP_CFG(GPIO112, AF7) +#define GPIO121_KP_MKIN4 MFP_CFG(GPIO121, AF7) +#endif /* __ASM_MACH_MFP_PXA168_H */
arch/arm/mach-mmp/include/mach/pxa168.h +7 -0
@@ -11,6 +11,7 @@ extern void __init pxa168_init_irq(void);#include <plat/i2c.h> #include <plat/pxa3xx_nand.h> #include <video/pxa168fb.h> +#include <plat/pxa27x_keypad.h> extern struct pxa_device_desc pxa168_device_uart1;extern struct pxa_device_desc pxa168_device_uart2;
@@ -27,6 +28,7 @@ extern struct pxa_device_desc pxa168_device_ssp4;extern struct pxa_device_desc pxa168_device_ssp5;extern struct pxa_device_desc pxa168_device_nand;extern struct pxa_device_desc pxa168_device_fb; +extern struct pxa_device_desc pxa168_device_keypad;static inline int pxa168_add_uart (int id) {
@@ -105,4 +107,9 @@ static inline int pxa168_add_fb(struct pxa168fb_mach_info *mi) return pxa_register_device(&pxa168_device_fb, mi, sizeof(*mi)); } +static inline int pxa168_add_keypad (struct pxa27x_keypad_platform_data *data) +{ +return pxa_register_device (&pxa168_device_keypad, data,sizeof (*data)); +} +#endif /* __ASM_MACH_PXA168_H */
arch/arm/mach-mmp/pxa168.c +3 -0
@@ -77,6 +77,7 @@ static APBC_CLK(ssp2, PXA168_SSP2, 4, 0); static APBC_CLK(ssp3, PXA168_SSP3, 4, 0); static APBC_CLK(ssp4, PXA168_SSP4, 4, 0); static APBC_CLK(ssp5, PXA168_SSP5, 4, 0); +static APBC_CLK(keypad, PXA168_KPC, 0, 32000); static APMU_CLK(nand, NAND, 0x01db, 208000000); static APMU_CLK(lcd, LCD, 0x7f, 312000000);
@@ -98,6 +99,7 @@ static struct clk_lookup pxa168_clkregs[] = {INIT_CLKREG (&clk_ssp5,"pxa168-ssp.4" ,NULL ),INIT_CLKREG (&clk_nand,"pxa3xx-nand" ,NULL ),INIT_CLKREG (&clk_lcd,"pxa168-fb" ,NULL ), + INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL), };static int __init pxa168_init (void )
@@ -150,3 +152,4 @@ PXA168_DEVICE(ssp3, "pxa168-ssp", 2, SSP3, 0xd401f000, 0x40, 56, 57);PXA168_DEVICE (ssp4,"pxa168-ssp" ,3 ,SSP4 ,0xd4020000 ,0x40 ,58 ,59 );PXA168_DEVICE (ssp5,"pxa168-ssp" ,4 ,SSP5 ,0xd4021000 ,0x40 ,60 ,61 );PXA168_DEVICE (fb,"pxa168-fb" ,-1 ,LCD ,0xd420b000 ,0x1c8 ); +PXA168_DEVICE (keypad,"pxa27x-keypad" ,-1 ,KEYPAD ,0xd4012000 ,0x4c );
drivers/input/keyboard/Kconfig +1 -1
@@ -338,7 +338,7 @@ config KEYBOARD_OPENCORES config KEYBOARD_PXA27x tristate "PXA27x/PXA3xx keypad support" - depends on PXA27x || PXA3xx + depends on PXA27x || PXA3xx || ARCH_MMP help Enable support for PXA27x/PXA3xx keypad controller.
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 2/6 RESEND] ARM: pxa168: added keypad support
Quoted 1 line · Mark F. Brown
Signed-off-by Mark F. Brown <[email protected]>
Applied.
PATCH RESEND v2 2/6 ARM: pxa168: added keypad support
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 7 +++++++ arch/arm/mach-mmp/include/mach/pxa168.h | 7 +++++++ arch/arm/mach-mmp/pxa168.c | 3 +++ drivers/input/keyboard/Kconfig | 2 +- 4 files changed, 18 insertions(+), 1 deletions(-)
arch/arm/mach-mmp/include/mach/mfp-pxa168.h +7 -0
@@ -289,4 +289,11 @@#define GPIO86_PWM1_OUT MFP_CFG(GPIO86, AF2)#define GPIO86_PWM2_OUT MFP_CFG(GPIO86, AF3) +/* Keypad */ +#define GPIO109_KP_MKIN1 MFP_CFG(GPIO109, AF7) +#define GPIO110_KP_MKIN0 MFP_CFG(GPIO110, AF7) +#define GPIO111_KP_MKOUT7 MFP_CFG(GPIO111, AF7) +#define GPIO112_KP_MKOUT6 MFP_CFG(GPIO112, AF7) +#define GPIO121_KP_MKIN4 MFP_CFG(GPIO121, AF7) +#endif /* __ASM_MACH_MFP_PXA168_H */
arch/arm/mach-mmp/include/mach/pxa168.h +7 -0
@@ -11,6 +11,7 @@ extern void __init pxa168_init_irq(void);#include <plat/i2c.h> #include <plat/pxa3xx_nand.h> #include <video/pxa168fb.h> +#include <plat/pxa27x_keypad.h> extern struct pxa_device_desc pxa168_device_uart1;extern struct pxa_device_desc pxa168_device_uart2;
@@ -27,6 +28,7 @@ extern struct pxa_device_desc pxa168_device_ssp4;extern struct pxa_device_desc pxa168_device_ssp5;extern struct pxa_device_desc pxa168_device_nand;extern struct pxa_device_desc pxa168_device_fb; +extern struct pxa_device_desc pxa168_device_keypad;static inline int pxa168_add_uart (int id) {
@@ -105,4 +107,9 @@ static inline int pxa168_add_fb(struct pxa168fb_mach_info *mi) return pxa_register_device(&pxa168_device_fb, mi, sizeof(*mi)); } +static inline int pxa168_add_keypad (struct pxa27x_keypad_platform_data *data) +{ +return pxa_register_device (&pxa168_device_keypad, data,sizeof (*data)); +} +#endif /* __ASM_MACH_PXA168_H */
arch/arm/mach-mmp/pxa168.c +3 -0
@@ -77,6 +77,7 @@ static APBC_CLK(ssp2, PXA168_SSP2, 4, 0); static APBC_CLK(ssp3, PXA168_SSP3, 4, 0); static APBC_CLK(ssp4, PXA168_SSP4, 4, 0); static APBC_CLK(ssp5, PXA168_SSP5, 4, 0); +static APBC_CLK(keypad, PXA168_KPC, 0, 32000); static APMU_CLK(nand, NAND, 0x01db, 208000000); static APMU_CLK(lcd, LCD, 0x7f, 312000000);
@@ -98,6 +99,7 @@ static struct clk_lookup pxa168_clkregs[] = {INIT_CLKREG (&clk_ssp5,"pxa168-ssp.4" ,NULL ),INIT_CLKREG (&clk_nand,"pxa3xx-nand" ,NULL ),INIT_CLKREG (&clk_lcd,"pxa168-fb" ,NULL ), + INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL), };static int __init pxa168_init (void )
@@ -150,3 +152,4 @@ PXA168_DEVICE(ssp3, "pxa168-ssp", 2, SSP3, 0xd401f000, 0x40, 56, 57);PXA168_DEVICE (ssp4,"pxa168-ssp" ,3 ,SSP4 ,0xd4020000 ,0x40 ,58 ,59 );PXA168_DEVICE (ssp5,"pxa168-ssp" ,4 ,SSP5 ,0xd4021000 ,0x40 ,60 ,61 );PXA168_DEVICE (fb,"pxa168-fb" ,-1 ,LCD ,0xd420b000 ,0x1c8 ); +PXA168_DEVICE (keypad,"pxa27x-keypad" ,-1 ,KEYPAD ,0xd4012000 ,0x4c );
drivers/input/keyboard/Kconfig +1 -1
@@ -338,7 +338,7 @@ config KEYBOARD_OPENCORES config KEYBOARD_PXA27x tristate "PXA27x/PXA3xx keypad support" - depends on PXA27x || PXA3xx + depends on PXA27x || PXA3xx || ARCH_MMP help Enable support for PXA27x/PXA3xx keypad controller.
Signature · 1 line
1.7.0.4
PATCH RESEND v2 3/6 ARM: pxa168: added wake clear register support for APMU
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/regs-apmu.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-mmp/include/mach/regs-apmu.h +12 -0
@@ -33,4 +33,16 @@#define APMU_FNRST_DIS (1 << 1)#define APMU_AXIRST_DIS (1 << 0) +/* Wake Clear Register */ +#define APMU_WAKE_CLR APMU_REG(0x07c) + +#define APMU_PXA168_KP_WAKE_CLR (1 << 7) +#define APMU_PXA168_CFI_WAKE_CLR (1 << 6) +#define APMU_PXA168_XD_WAKE_CLR (1 << 5) +#define APMU_PXA168_MSP_WAKE_CLR (1 << 4) +#define APMU_PXA168_SD4_WAKE_CLR (1 << 3) +#define APMU_PXA168_SD3_WAKE_CLR (1 << 2) +#define APMU_PXA168_SD2_WAKE_CLR (1 << 1) +#define APMU_PXA168_SD1_WAKE_CLR (1 << 0) +#endif /* __ASM_MACH_REGS_APMU_H */
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 3/6 RESEND] ARM: pxa168: added wake clear register support for APMU
Quoted 1 line · Mark F. Brown
Signed-off-by Mark F. Brown <[email protected]>
Applied.
PATCH RESEND v2 3/6 ARM: pxa168: added wake clear register support for APMU
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/regs-apmu.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
arch/arm/mach-mmp/include/mach/regs-apmu.h +12 -0
@@ -33,4 +33,16 @@#define APMU_FNRST_DIS (1 << 1)#define APMU_AXIRST_DIS (1 << 0) +/* Wake Clear Register */ +#define APMU_WAKE_CLR APMU_REG(0x07c) + +#define APMU_PXA168_KP_WAKE_CLR (1 << 7) +#define APMU_PXA168_CFI_WAKE_CLR (1 << 6) +#define APMU_PXA168_XD_WAKE_CLR (1 << 5) +#define APMU_PXA168_MSP_WAKE_CLR (1 << 4) +#define APMU_PXA168_SD4_WAKE_CLR (1 << 3) +#define APMU_PXA168_SD3_WAKE_CLR (1 << 2) +#define APMU_PXA168_SD2_WAKE_CLR (1 << 1) +#define APMU_PXA168_SD1_WAKE_CLR (1 << 0) +#endif /* __ASM_MACH_REGS_APMU_H */
Signature · 1 line
1.7.0.4
PATCH RESEND v2 4/6 ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
In reply to Mark F. Brownmach-mmp needs to clear wake event in order to clear the keypad interrupt
--- arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 1 + drivers/input/keyboard/pxa27x_keypad.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +1 -0
@@ -52,6 +52,7 @@ struct pxa27x_keypad_platform_data {/* key debounce interval */ unsigned int debounce_interval; +void (*clear_wakeup_event)(void ); };extern void pxa_set_keypad_info (struct pxa27x_keypad_platform_data *info);
drivers/input/keyboard/pxa27x_keypad.c +10 -0
@@ -330,11 +330,21 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) keypad->direct_key_state = new_state; } +static void clear_wakeup_event (struct pxa27x_keypad *keypad) +{ +struct pxa27x_keypad_platform_data *pdata = keypad->pdata; + +if (pdata->clear_wakeup_event) + (pdata->clear_wakeup_event)(); +} +static irqreturn_t pxa27x_keypad_irq_handler (int irq,void *dev_id) {struct pxa27x_keypad *keypad = dev_id;unsigned long kpc =keypad_readl (KPC ); +clear_wakeup_event (keypad); +if (kpc &KPC_DI )pxa27x_keypad_scan_direct (keypad);
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 4/6 RESEND] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
Quoted 3 lines · Mark F. Brown
mach-mmp needs to clear wake event in order to clear the keypad interrupt
Signed-off-by Mark F. Brown <[email protected]>
Applied.
Re: [PATCH v2 4/6 RESEND] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
In reply to Mark F. BrownQuoted 13 lines · Mark F. Brown
mach-mmp needs to clear wake event in order to clear the keypad interrupt
Signed-off-by Mark F. Brown <[email protected]>--- arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | 1 + drivers/input/keyboard/pxa27x_keypad.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0
-0
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h struct pxa27x_keypad_platform_data { · line 55
Quoted 4 lines
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +1
-0@@ -52,6 +52,7 @@ struct pxa27x_keypad_platform_data {/* key debounce interval */ unsigned int debounce_interval; +void (*clear_wakeup_event)(void );
I understand, this is a bit late... but still I want to ask a question:
As I understand, the clear_wakeup_event() function is called in interrupt context, wouldn't it be wiser to add a comment on this, so platform (current/future) code will be aware and will make no heavy stuff in it (accidentally).
Quoted 29 lines
arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0
-0};extern void pxa_set_keypad_info (struct pxa27x_keypad_platform_data *info);drivers/input/keyboard/pxa27x_keypad.c +10
-0@@ -330,11 +330,21 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) keypad->direct_key_state = new_state; } +static void clear_wakeup_event (struct pxa27x_keypad *keypad) +{ +struct pxa27x_keypad_platform_data *pdata = keypad->pdata; + +if (pdata->clear_wakeup_event) + (pdata->clear_wakeup_event)(); +} +static irqreturn_t pxa27x_keypad_irq_handler (int irq,void *dev_id) {struct pxa27x_keypad *keypad = dev_id;unsigned long kpc =keypad_readl (KPC ); +clear_wakeup_event (keypad); +if (kpc &KPC_DI )pxa27x_keypad_scan_direct (keypad);
Signature · 2 lines
Regards, Igor.
Re: [PATCH v2 4/6 RESEND] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
Quoted 15 lines · Igor Grinberg
Quoted 14 lines · Mark F. Brown
mach-mmp needs to clear wake event in order to clear the keypad interrupt
Signed-off-by Mark F. Brown <[email protected]>---
?arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | ? ?1 + ?drivers/input/keyboard/pxa27x_keypad.c ? ? ? ? | ? 10 ++++++++++ ?2 files changed, 11 insertions(+), 0 deletions(-)arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0
-0@@ -52,6 +52,7 @@ struct pxa27x_keypad_platform_data {
Quoted 9 lines
Quoted 3 lines
? ? ? /* key debounce interval */
? ? ? unsigned int ? ?debounce_interval;
+ ? ? void ? ? ? ? ? ?(*clear_wakeup_event)(void);I understand, this is a bit late... but still I want to ask a question:
As I understand, theclear_wakeup_event()function is called in interrupt context, wouldn't it be wiser to add a comment on this, so platform (current/future) code will be aware and will make no heavy stuff in it (accidentally).
A comment will be good to have indeed, not just explaining the context this function will be running, but also a bit about why this is introduced.
Mark,
If you come up with an updated patch, I'll help rebase my tree.
Quoted 35 lines
Quoted 19 lines
?};
?extern void
pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);drivers/input/keyboard/pxa27x_keypad.c +8
-0@@ -330,11 +330,21 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) ? ? ? keypad->direct_key_state = new_state; ?} +static void clear_wakeup_event (struct pxa27x_keypad *keypad) +{ + ? ? struct pxa27x_keypad_platform_data *pdata = keypad->pdata; + + ? ? if (pdata->clear_wakeup_event) + ? ? ? ? ? ? (pdata->clear_wakeup_event)(); +} +drivers/input/keyboard/pxa27x_keypad.c static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) · line 350
Quoted 10 lines
drivers/input/keyboard/pxa27x_keypad.c +2
-0?static irqreturn_t pxa27x_keypad_irq_handler(int irq, void *dev_id) ?{ ? ? ? struct pxa27x_keypad *keypad = dev_id; ? ? ? unsigned long kpc = keypad_readl(KPC); + ? ? clear_wakeup_event(keypad); + ? ? ? if (kpc & KPC_DI) ? ? ? ? ? ? ? pxa27x_keypad_scan_direct(keypad);--
Regards,
Igor.
Re: [PATCH v2 4/6 RESEND] ARM: pxa27x_keypad: added wakeup event handler for keypad interrupts
Quoted 26 lines · Eric Miao
Quoted 15 lines · Igor Grinberg
Quoted 14 lines · Mark F. Brown
mach-mmp needs to clear wake event in order to clear the keypad interrupt
Signed-off-by Mark F. Brown <[email protected]>---
?arch/arm/plat-pxa/include/plat/pxa27x_keypad.h | ? ?1 + ?drivers/input/keyboard/pxa27x_keypad.c ? ? ? ? | ? 10 ++++++++++ ?2 files changed, 11 insertions(+), 0 deletions(-)arch/arm/plat-pxa/include/plat/pxa27x_keypad.h +0
-0@@ -52,6 +52,7 @@ struct pxa27x_keypad_platform_data {Quoted 9 lines
Quoted 3 lines
? ? ? /* key debounce interval */
? ? ? unsigned int ? ?debounce_interval;
+ ? ? void ? ? ? ? ? ?(*clear_wakeup_event)(void);I understand, this is a bit late... but still I want to ask a question:
As I understand, theclear_wakeup_event()function is called in interrupt context, wouldn't it be wiser to add a comment on this, so platform (current/future) code will be aware and will make no heavy stuff in it (accidentally).
Quoted 43 lines
A comment will be good to have indeed, not just explaining the context this function will be running, but also a bit about why this is introduced.
Mark,
If you come up with an updated patch, I'll help rebase my tree.
Quoted 35 lines
Quoted 19 lines
?};
?extern void
pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);drivers/input/keyboard/pxa27x_keypad.c +8
-0@@ -330,11 +330,21 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) ? ? ? keypad->direct_key_state = new_state; ?} +static void clear_wakeup_event (struct pxa27x_keypad *keypad) +{ + ? ? struct pxa27x_keypad_platform_data *pdata = keypad->pdata; + + ? ? if (pdata->clear_wakeup_event) + ? ? ? ? ? ? (pdata->clear_wakeup_event)(); +} +drivers/input/keyboard/pxa27x_keypad.c static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad) · line 350
Quoted 10 lines
drivers/input/keyboard/pxa27x_keypad.c +2
-0?static irqreturn_t pxa27x_keypad_irq_handler(int irq, void *dev_id) ?{ ? ? ? struct pxa27x_keypad *keypad = dev_id; ? ? ? unsigned long kpc = keypad_readl(KPC); + ? ? clear_wakeup_event(keypad); + ? ? ? if (kpc & KPC_DI) ? ? ? ? ? ? ? pxa27x_keypad_scan_direct(keypad);--
Regards,
Igor.
Ok will do!
-- Mark
PATCH RESEND v2 5/6 ARM: pxa168: added keypad wake clear event support for platform
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/pxa168.h | 5 +++++ arch/arm/mach-mmp/pxa168.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/mach-mmp/include/mach/pxa168.h +5 -0
@@ -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)); }
arch/arm/mach-mmp/pxa168.c +10 -0
@@ -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 );
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 5/6 RESEND] ARM: pxa168: added keypad wake clear event support for platform
Quoted 1 line · Mark F. Brown
Signed-off-by Mark F. Brown <[email protected]>
Applied.
PATCH RESEND v2 5/6 ARM: pxa168: added keypad wake clear event support for platform
In reply to Mark F. Brown--- arch/arm/mach-mmp/include/mach/pxa168.h | 5 +++++ arch/arm/mach-mmp/pxa168.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/mach-mmp/include/mach/pxa168.h +5 -0
@@ -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)); }
arch/arm/mach-mmp/pxa168.c +10 -0
@@ -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 );
Signature · 1 line
1.7.0.4
PATCH RESEND v2 6/6 ARM: pxa168: aspenite: add board support for keypad
In reply to Mark F. Brown--- arch/arm/mach-mmp/aspenite.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)
arch/arm/mach-mmp/aspenite.c +27 -0
@@ -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);
Signature · 1 line
1.7.0.4
Eric Miao
AppliedRe: [PATCH v2 6/6 RESEND] ARM: pxa168: aspenite: add board support for keypad
Quoted 1 line · Mark F. Brown
Signed-off-by Mark F. Brown <[email protected]>
Applied.