login
Login
/
Register
Search
Search this site:
Forums
News
Blogs
Features
Site
Home
»
Mailing list archives
»
linux-kernel
»
2010
»
August
»
31
Re: [PATCH 2/5] ARM: pxa168: added keypad support
view
thread
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
[view in full thread]
From: Haojian Zhuang
Subject:
Re: [PATCH 2/5] ARM: pxa168: added keypad support
Date: Monday, August 30, 2010 - 9:56 pm
On Thu, Aug 26, 2010 at 5:18 PM, Mark F. Brown <mark.brown314@gmail.com> wrote:
quoted text
> Signed-off-by: Mark F. Brown <mark.brown314@gmail.com> > --- > 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(-) > > diff --git a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h > index ded43c4..4621067 100644 > --- a/arch/arm/mach-mmp/include/mach/mfp-pxa168.h > +++ b/arch/arm/mach-mmp/include/mach/mfp-pxa168.h > @@ -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 */ > diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h > index 220738f..f34e663 100644 > --- a/arch/arm/mach-mmp/include/mach/pxa168.h > +++ b/arch/arm/mach-mmp/include/mach/pxa168.h > @@ -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 */ > diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c > index eaebf66..2fa16fb 100644 > --- a/arch/arm/mach-mmp/pxa168.c > +++ b/arch/arm/mach-mmp/pxa168.c > @@ -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); > diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig > index 9cc488d..aa037fe 100644 > --- a/drivers/input/keyboard/Kconfig > +++ b/drivers/input/keyboard/Kconfig > @@ -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. > > -- > 1.7.0.4 >
It seems good. Acked --
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to
majordomo@vger.kernel.org
More majordomo info at
http://vger.kernel.org/majordomo-info.html
Please read the FAQ at
http://www.tux.org/lkml/
Previous message: [
thread
] [
date
] [
author
]
Next message: [
thread
] [
date
] [
author
]
Messages in current thread:
[PATCH 0/5] ARM: pxa168: add keypad support
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
[PATCH 1/5] ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h to p ...
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
[PATCH 2/5] ARM: pxa168: added keypad support
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
[PATCH 3/5] ARM: pxa168: added wake clear register support ...
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
[PATCH 4/5] ARM: pxa168: added special case handler for ke ...
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
[PATCH 5/5] ARM: pxa168: aspenite: add board support for k ...
, Mark F. Brown
, (Thu Aug 26, 2:18 am)
Re: [PATCH 1/5] ARM: pxa27x/pxa3xx: moved pxa27x_keypad.h ...
, Eric Miao
, (Mon Aug 30, 9:13 pm)
Re: [PATCH 4/5] ARM: pxa168: added special case handler fo ...
, Haojian Zhuang
, (Mon Aug 30, 9:53 pm)
Re: [PATCH 2/5] ARM: pxa168: added keypad support
, Haojian Zhuang
, (Mon Aug 30, 9:56 pm)
Re: [PATCH 5/5] ARM: pxa168: aspenite: add board support f ...
, Haojian Zhuang
, (Mon Aug 30, 10:00 pm)
Re: [PATCH 4/5] ARM: pxa168: added special case handler fo ...
, Mark F. Brown
, (Mon Aug 30, 11:28 pm)
Re: [PATCH 4/5] ARM: pxa168: added special case handler fo ...
, Eric Miao
, (Tue Aug 31, 12:05 am)
Re: [PATCH 4/5] ARM: pxa168: added special case handler fo ...
, Mark F. Brown
, (Tue Aug 31, 12:13 am)
Re: [PATCH 4/5] ARM: pxa168: added special case handler fo ...
, Eric Miao
, (Tue Aug 31, 12:15 am)
Re: [PATCH 5/5] ARM: pxa168: aspenite: add board support f ...
, Mark F. Brown
, (Thu Sep 2, 9:50 pm)
Re: [PATCH 5/5] ARM: pxa168: aspenite: add board support f ...
, Marek Vasut
, (Fri Sep 3, 7:11 am)
Re: [PATCH 5/5] ARM: pxa168: aspenite: add board support f ...
, Eric Miao
, (Fri Sep 3, 7:39 am)
Navigation
Create content
Mailing list archives
Recent posts
Popular discussions
linux-kernel
:
FUJITA Tomonori
Re: [Scst-devel] Integration of SCST in the mainstream Linux kernel
Uwe Kleine-König
Re: [PATCH v2] ARM: allow, but warn, when issuing ioremap() on RAM
Ingo Molnar
Re: [RFC/RFT PATCH] sched: automated per tty task groups
Josef Bacik
[PATCH] fallocate.2: add FALLOC_FL_PUNCH_HOLE flag definition
Andrew Morton
Re: [PATCH v3 0/4] Introduce hardware spinlock framework
git
:
Stefan Richter
Re: [kernel.org users] [RFD] On deprecating "git-foo" for builtins
Bert Wesarg
[TopGit PATCH v3 06/12] list_deps: accept -i/-w
Junio C Hamano
Re: [PATCH] Detached HEAD (experimental)
A Large Angry SCM
Re: [RFC] origin link for cherry-pick and revert
Petr Baudis
Re: PPC SHA-1 Updates in "pu"
git-commits-head
:
Linux Kernel Mailing List
libata: disable ATAPI AN by default
Linux Kernel Mailing List
ARM: 5905/1: ARM: Global ASID allocation on SMP
Linux Kernel Mailing List
misc: replace remaining __FUNCTION__ with __func__
Linux Kernel Mailing List
Disallow gcc versions 4.1.{0,1}
Linux Kernel Mailing List
timer: Try to survive timer callback preempt_count leak
linux-netdev
:
Arnaldo Carvalho de Melo
Re: [PATCH 06/37] dccp: Limit feature negotiation to connection setup phase
Gerrit Renker
[PATCH 1/5] dccp: Initialisation framework for feature negotiation
Daniel Lezcano
getsockopt(TCP_DEFER_ACCEPT) value change
David Miller
Re: 2.6.27.18: bnx2/tg3: BUG: "scheduling while atomic" trying to ifenslave a seco...
Badalian Vyacheslav
Re: tc filter flow hash question
openbsd-misc
:
Boris Goldberg
Re: HP ProLiant DL320 v. Sun Fire V125
Stuart Henderson
Re: Kuro5hin: OpenBSD Founder Theo deRaadt Has Conflict of Interest With AMD
Karel Kulhavy
Re: No Blob without Puffy
Darrin Chandler
Re: strange output on openbsd C code
Nick Holland
Re: Install OpenBSD from USB ?
Colocation donated by:
Syndicate