ia64/xen-unstable

changeset 13906:eb6c19ed6e67

[IA64] Only one serial console port on Tiger2

Tiger2 also only has one serial port at 0x2f8, so consolidate
com port setup w/ Tiger4.

Signed-off-by: Simon Horman <horms@verge.net.au>
author awilliam@xenbuild2.aw
date Thu Feb 15 10:31:39 2007 -0700 (2007-02-15)
parents 2b3dd681dbce
children ac18d251df63
files xen/arch/ia64/linux-xen/setup.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/setup.c	Thu Feb 15 10:25:33 2007 -0700
     1.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Thu Feb 15 10:31:39 2007 -0700
     1.3 @@ -318,7 +318,7 @@ io_port_init (void)
     1.4  static int __init
     1.5  intel_tiger_console_setup(void)
     1.6  {
     1.7 -	extern struct ns16550_defaults ns16550_com1, ns16550_com2;
     1.8 +	extern struct ns16550_defaults ns16550_com1;
     1.9  	efi_system_table_t *systab;
    1.10  	efi_config_table_t *tables;
    1.11  	struct acpi20_table_rsdp *rsdp = NULL;
    1.12 @@ -353,32 +353,21 @@ intel_tiger_console_setup(void)
    1.13  	if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1))
    1.14  		return -ENODEV;
    1.15  
    1.16 -	/* Only looking for Intel systems */
    1.17 -	if (strncmp(hdr->oem_id, "INTEL", 5))
    1.18 +	/*
    1.19 +	 * Only looking for Intel Tiger systems
    1.20 +	 * Tiger 2: SR870BH2
    1.21 +	 * Tiger 4: SR870BN4
    1.22 +	 */
    1.23 +	if (strncmp(hdr->oem_id, "INTEL", 5) ||
    1.24 +	    (!strncmp(hdr->oem_table_id, "SR870BH2", 8) &&
    1.25 +	     !strncmp(hdr->oem_table_id, "SR870BN4", 8)))
    1.26  		return -ENODEV;
    1.27  
    1.28 -	if (!strncmp(hdr->oem_table_id, "SR870BH2", 8)) {
    1.29 -		/* Tiger 2 */
    1.30 -		ns16550_com1.baud = BAUD_AUTO;
    1.31 -		ns16550_com1.io_base = 0x3f8;
    1.32 -		ns16550_com1.irq = 4;
    1.33 -
    1.34 -		ns16550_com2.baud = BAUD_AUTO;
    1.35 -		ns16550_com2.io_base = 0x2f8;
    1.36 -		ns16550_com2.irq = 3;
    1.37 +	ns16550_com1.baud = BAUD_AUTO;
    1.38 +	ns16550_com1.io_base = 0x2f8;
    1.39 +	ns16550_com1.irq = 3;
    1.40  
    1.41 -		return 0;
    1.42 -
    1.43 -	} else if (!strncmp(hdr->oem_table_id, "SR870BN4", 8)) {
    1.44 -		/* Tiger 4 */
    1.45 -		ns16550_com1.baud = BAUD_AUTO;
    1.46 -		ns16550_com1.io_base = 0x2f8;
    1.47 -		ns16550_com1.irq = 3;
    1.48 -		
    1.49 -		return 0;
    1.50 -	}
    1.51 -
    1.52 -	return -ENODEV;
    1.53 +	return 0;
    1.54  }
    1.55  #endif
    1.56