summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:20:39 -0600
committerQuinn Jensen <quinn.jensen@freescale.com>2007-10-24 21:20:39 -0600
commit72e44f048b0f2888167b1a2312e751054a4d23fe (patch)
treed61140c59afa2ab85f8c4ad8f4181d58cb1460ff /arch
parentef1dacd6cde6892a7533d085d72c5078f5a43d99 (diff)
Bugzilla 43: Fix FIR on MX31
Patch for Bugzilla 43: Fix FIR on linux 2.6.22 kernel for MX31. After adding FIR support, loading mxc_ir.ko fails with ENOMEM and "Failed to request UART memory region". This patch makes sure UART2 is left available for the FIR driver. http://www.bitshrine.org/gpp/linux-2.6.22-mx-Bugzilla-43-Fix-FIR-on-MX31.patch
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx3/serial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/serial.c b/arch/arm/mach-mx3/serial.c
index 6e9811762136..a58b090029aa 100644
--- a/arch/arm/mach-mx3/serial.c
+++ b/arch/arm/mach-mx3/serial.c
@@ -188,6 +188,7 @@ static struct platform_device mxc_uart_device1 = {
},
};
+#if UART2_ENABLED == 1
static struct platform_device mxc_uart_device2 = {
.name = "mxcintuart",
.id = 1,
@@ -195,6 +196,7 @@ static struct platform_device mxc_uart_device2 = {
.platform_data = &mxc_ports[1],
},
};
+#endif
static struct platform_device mxc_uart_device3 = {
.name = "mxcintuart",
@@ -226,7 +228,9 @@ static int __init mxc_init_uart(void)
{
/* Register all the MXC UART platform device structures */
platform_device_register(&mxc_uart_device1);
+#if UART2_ENABLED == 1
platform_device_register(&mxc_uart_device2);
+#endif
/* Grab ownership of shared UARTs 3 and 4, only when enabled */
#if UART3_ENABLED == 1