aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/devices.c
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2008-01-23 00:39:13 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-19 06:29:05 -0400
commit37320980414f5a7654ee08a047194224c6bba46e (patch)
treea8d6efa1f182e22b2f05ab5d31722d97acd7d7dc /arch/arm/mach-pxa/devices.c
parent450d28749c9bf2cc6d274695fe454bb53456428d (diff)
[ARM] pxa: add pxa27x_keypad device and pxa_set_keypad_info()
also update the clk definitions in pxa27x and pxa3xx. Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/devices.c')
-rw-r--r--arch/arm/mach-pxa/devices.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index bfccb80ac8ef..3665e242f1f9 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -11,6 +11,7 @@
11#include <asm/arch/irda.h> 11#include <asm/arch/irda.h>
12#include <asm/arch/i2c.h> 12#include <asm/arch/i2c.h>
13#include <asm/arch/ohci.h> 13#include <asm/arch/ohci.h>
14#include <asm/arch/pxa27x_keypad.h>
14 15
15#include "devices.h" 16#include "devices.h"
16 17
@@ -396,6 +397,31 @@ struct platform_device pxa25x_device_assp = {
396 397
397#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) 398#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
398 399
400static struct resource pxa27x_resource_keypad[] = {
401 [0] = {
402 .start = 0x41500000,
403 .end = 0x4150004c,
404 .flags = IORESOURCE_MEM,
405 },
406 [1] = {
407 .start = IRQ_KEYPAD,
408 .end = IRQ_KEYPAD,
409 .flags = IORESOURCE_IRQ,
410 },
411};
412
413struct platform_device pxa27x_device_keypad = {
414 .name = "pxa27x-keypad",
415 .id = -1,
416 .resource = pxa27x_resource_keypad,
417 .num_resources = ARRAY_SIZE(pxa27x_resource_keypad),
418};
419
420void __init pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info)
421{
422 pxa_register_device(&pxa27x_device_keypad, info);
423}
424
399static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32); 425static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32);
400 426
401static struct resource pxa27x_resource_ohci[] = { 427static struct resource pxa27x_resource_ohci[] = {