summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2004-06-30 15:25:37 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2004-06-30 15:25:37 +0000
commit07b7c0e7e8f05e023d4f9537778387c065f65cee (patch)
tree9ecf663864bacd3dd019d99f309e590a68bef01f /sys/arch/hppa
parent31deb8c056c1bb2359b9fb55bcc97d95b6d37c42 (diff)
only touch bridge regs that we need now -- the rest for the card-mode
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/dev/dino.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/arch/hppa/dev/dino.c b/sys/arch/hppa/dev/dino.c
index 75774a390da..88f6da40048 100644
--- a/sys/arch/hppa/dev/dino.c
+++ b/sys/arch/hppa/dev/dino.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dino.c,v 1.7 2004/06/17 06:06:18 mickey Exp $ */
+/* $OpenBSD: dino.c,v 1.8 2004/06/30 15:25:36 mickey Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
@@ -1439,19 +1439,24 @@ dinoattach(parent, self, aux)
}
sc->sc_regs = r = (volatile struct dino_regs *)sc->sc_bh;
+ r->pciror = 0;
+ r->pciwor = 0;
+ r->io_addr_en = 0;
+ r->gmask &= ~1; /* allow GSC bus req */
+#ifdef notyet_card_mode
r->io_control = 0x80;
r->pamr = 0;
r->papr = 0;
r->io_fbb_en |= 1;
- r->io_addr_en = 0;
r->damode = 0;
- r->gmask &= ~1; /* allow GSC bus req */
- r->pciror = 0;
- r->pciwor = 0;
- r->brdg_feat = 0xc0000000;
+ r->brdg_feat = 0xc0000000 XXX;
+ r->mltim = 0x40; /* 64 clocks */
+ r->tltim = 0x8c; /* 12 clocks */
/* PCI reset */
r->pcicmd = 0x6f;
+ DELAY(10000); /* 10ms for reset to settle */
+#endif
snprintf(sc->sc_ioexname, sizeof(sc->sc_ioexname),
"%s_io", sc->sc_dv.dv_xname);