diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-05-16 20:31:31 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-05-16 20:31:31 +0000 |
| commit | 94e3ec8b605894e812bc365088e0dc94ff83c15b (patch) | |
| tree | ad5d0f60cb5676362729e745c2d4a71d15d1903a | |
| parent | ea2ffba9d780b4f0c803feae0ebd3f305cd867f1 (diff) | |
| download | FreeBSD-src-94e3ec8b605894e812bc365088e0dc94ff83c15b.zip FreeBSD-src-94e3ec8b605894e812bc365088e0dc94ff83c15b.tar.gz | |
It is not necessary (and in some cases harmful) to hardcode ata_kauai's
IRQ to 39 on K2 devices, as well as Shasta ones.
Reported by: Andreas Tobler
| -rw-r--r-- | sys/powerpc/powermac/ata_kauai.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c index f7b6daa..fd45061 100644 --- a/sys/powerpc/powermac/ata_kauai.c +++ b/sys/powerpc/powermac/ata_kauai.c @@ -220,8 +220,9 @@ ata_kauai_probe(device_t dev) if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) sc->shasta = 1; - /* Regular Kauai controllers apparently need this hack */ - if (!sc->shasta) + /* Pre-K2 controllers apparently need this hack */ + if (!sc->shasta && + (compatstring == NULL || strcmp(compatstring, "K2-UATA") != 0)) bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1); rid = PCIR_BARS; |
