diff options
author | Nicolas Pitre <nico@cam.org> | 2005-10-28 11:39:33 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 11:39:33 -0400 |
commit | 6f475c0133eb91c7df3b056843dc33d2824368a2 (patch) | |
tree | 051e35468fb1965c72e6fa5b679fac48975508b8 /arch/arm/mach-pxa/generic.c | |
parent | a999cb04b4bfb4a2243383f00d5714b8d7163035 (diff) |
[ARM] 2897/2: PXA2xx IRDA support
Patch from Nicolas Pitre
This is the PXA2xx common IRDA driver, plus platform support
for Lubbock and Mainstone.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 218eb9671fa3..3248bc9b9495 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <asm/arch/udc.h> | 34 | #include <asm/arch/udc.h> |
35 | #include <asm/arch/pxafb.h> | 35 | #include <asm/arch/pxafb.h> |
36 | #include <asm/arch/mmc.h> | 36 | #include <asm/arch/mmc.h> |
37 | #include <asm/arch/irda.h> | ||
37 | #include <asm/arch/i2c.h> | 38 | #include <asm/arch/i2c.h> |
38 | 39 | ||
39 | #include "generic.h" | 40 | #include "generic.h" |
@@ -301,6 +302,22 @@ static struct platform_device i2s_device = { | |||
301 | .num_resources = ARRAY_SIZE(i2s_resources), | 302 | .num_resources = ARRAY_SIZE(i2s_resources), |
302 | }; | 303 | }; |
303 | 304 | ||
305 | static u64 pxaficp_dmamask = ~(u32)0; | ||
306 | |||
307 | static struct platform_device pxaficp_device = { | ||
308 | .name = "pxa2xx-ir", | ||
309 | .id = -1, | ||
310 | .dev = { | ||
311 | .dma_mask = &pxaficp_dmamask, | ||
312 | .coherent_dma_mask = 0xffffffff, | ||
313 | }, | ||
314 | }; | ||
315 | |||
316 | void __init pxa_set_ficp_info(struct pxaficp_platform_data *info) | ||
317 | { | ||
318 | pxaficp_device.dev.platform_data = info; | ||
319 | } | ||
320 | |||
304 | static struct platform_device *devices[] __initdata = { | 321 | static struct platform_device *devices[] __initdata = { |
305 | &pxamci_device, | 322 | &pxamci_device, |
306 | &udc_device, | 323 | &udc_device, |
@@ -308,6 +325,7 @@ static struct platform_device *devices[] __initdata = { | |||
308 | &ffuart_device, | 325 | &ffuart_device, |
309 | &btuart_device, | 326 | &btuart_device, |
310 | &stuart_device, | 327 | &stuart_device, |
328 | &pxaficp_device, | ||
311 | &i2c_device, | 329 | &i2c_device, |
312 | &i2s_device, | 330 | &i2s_device, |
313 | }; | 331 | }; |