lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap4' into for-next

Browse Source
This commit is contained in:
Tony Lindgren
2009-05-28 15:45:14 -07:00
parent 4c50d22a0c b04e8975e7
commit cd07ecc828
33 changed files with 1550 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-omap2/serial.c
View File

@@ -10,6 +10,9 @@
*
* Based off of arch/arm/mach-omap/omap1/serial.c
*
* Copyright (C) 2009 Texas Instruments
* Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -493,6 +496,10 @@ void __init omap_serial_init(void)
if (info == NULL)
return;
if (cpu_is_omap44xx()) {
for (i = 0; i < OMAP_MAX_NR_PORTS; i++)
serial_platform_data[i].irq += 32;
}
for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
struct plat_serial8250_port *p = serial_platform_data + i;