simplify IDE cable detection for Asus M2V

Change-Id: If8e4dcf405e24b744ac34f581c5609fcce96fd07
Signed-off-by: Florian Zumbiehl <florz@florz.de>
Reviewed-on: http://review.coreboot.org/371
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Florian Zumbiehl 2011-11-01 20:17:13 +01:00 committed by Stefan Reinauer
parent 1200ec5a53
commit f8ed90332c
1 changed files with 4 additions and 5 deletions

View File

@ -37,10 +37,9 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
if (!lpc_dev) if (!lpc_dev)
return 0; return 0;
acpi_io_base = pci_read_config16(lpc_dev, 0x88); acpi_io_base = pci_read_config16(lpc_dev, 0x88) & ~1;
if (!acpi_io_base || (acpi_io_base & ~1) == 0) if (!acpi_io_base)
return 0; return 0;
acpi_io_base &= ~1;
gpio_in = inl(acpi_io_base + 0x48); gpio_in = inl(acpi_io_base + 0x48);
/* bit 9 for primary port, clear if unconnected or 80-pin cable */ /* bit 9 for primary port, clear if unconnected or 80-pin cable */
@ -49,9 +48,9 @@ u32 vt8237_ide_80pin_detect(struct device *dev)
res |= gpio_in & (1<<4) ? 0 : VT8237R_IDE1_80PIN_CABLE; res |= gpio_in & (1<<4) ? 0 : VT8237R_IDE1_80PIN_CABLE;
printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "primary", printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "primary",
gpio_in & (1<<9) ? 40 : 80); res & VT8237R_IDE0_80PIN_CABLE ? 80 : 40);
printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "secondary", printk(BIOS_INFO, "Cable on %s PATA port: %d pin\n", "secondary",
gpio_in & (1<<4) ? 40 : 80); res & VT8237R_IDE1_80PIN_CABLE ? 80 : 40);
return res; return res;
} }