diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-07-02 07:17:35 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-07-02 07:17:35 +0000 |
| commit | da62d0c2eaceb8987ee1cb46b938e482012e599a (patch) | |
| tree | 29b74ca4ca22ceddafb15513db15ecbed0949766 | |
| parent | 2aff85d1062f124f3aa2f4b58c65c56211064699 (diff) | |
dont enable the second pci function for pciide support. we're going to
solve this problem a different way now.
| -rw-r--r-- | sys/dev/pci/jmb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/jmb.c b/sys/dev/pci/jmb.c index 685008e8787..12b78cc18b1 100644 --- a/sys/dev/pci/jmb.c +++ b/sys/dev/pci/jmb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jmb.c,v 1.1 2007/07/02 01:14:36 dlg Exp $ */ +/* $OpenBSD: jmb.c,v 1.2 2007/07/02 07:17:34 dlg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -145,11 +145,9 @@ jmb_attach(struct device *parent, struct device *self, void *aux) /* FALLTHROUGH */ case PCI_PRODUCT_JMICRON_JMB363: case PCI_PRODUCT_JMICRON_JMB361: - /* enable AHCI and put IDE on the second function */ - ctl0 |= JM_PCI_CTL0_PCIIDE_F1 | JM_PCI_CTL0_AHCI_EN | + /* enable AHCI */ + ctl0 |= JM_PCI_CTL0_AHCI_EN | JM_PCI_CTL0_SATA0_AHCI | JM_PCI_CTL0_SATA1_AHCI | - JM_PCI_CTL0_F0_SUBCLASS(JM_PCI_CTL0_SUBCLASS_AHCI) | - JM_PCI_CTL0_F1_SUBCLASS(JM_PCI_CTL0_SUBCLASS_IDE) | JM_PCI_CTL0_PCIIDE_CS | JM_PCI_CTL0_IDEDMA_CFG; break; } |