]> xenbits.xensource.com Git - xen.git/commitdiff
[IA64] Other Intel IPF platforms use COM1
authorAlex Williamson <alex.williamson@hp.com>
Tue, 1 Apr 2008 16:24:41 +0000 (10:24 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 1 Apr 2008 16:24:41 +0000 (10:24 -0600)
Signed-off-by: Anthony Xu <anthony.xu@intel.com>
xen/arch/ia64/linux-xen/setup.c

index 7b112d4523d7bda66bc49cdaa55e4df0aa29410e..a4696e9518ed1ad12e90f8d80f83936c553f2ea2 100644 (file)
@@ -405,16 +405,21 @@ acpi_oem_console_setup(void)
         * Tiger 2: SR870BH2
         * Tiger 4: SR870BN4
         */
-       if (strncmp(hdr->oem_id, "INTEL", 5) ||
-           (!strncmp(hdr->oem_table_id, "SR870BH2", 8) &&
-            !strncmp(hdr->oem_table_id, "SR870BN4", 8)))
-               return -ENODEV;
-
-       ns16550_com1.baud = BAUD_AUTO;
-       ns16550_com1.io_base = 0x2f8;
-       ns16550_com1.irq = 3;
-
-       return 0;
+       if (!strncmp(hdr->oem_id, "INTEL", 5)) {
+               if (!strncmp(hdr->oem_table_id, "SR870BH2", 8) ||
+                   !strncmp(hdr->oem_table_id, "SR870BN4", 8)) {
+                       ns16550_com1.baud = BAUD_AUTO;
+                       ns16550_com1.io_base = 0x2f8;
+                       ns16550_com1.irq = 3;
+                       return 0;
+               } else {
+                       ns16550_com1.baud = BAUD_AUTO;
+                       ns16550_com1.io_base = 0x3f8;
+                       ns16550_com1.irq = ns16550_com1_gsi = 4;
+                       return 0;
+               }
+       }
+       return -ENODEV;
 }
 #endif