summaryrefslogtreecommitdiffstats
path: root/drivers/parisc/dino.c
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@parisc-linux.org>2006-01-10 20:48:06 -0500
committerKyle McMartin <kyle@duet.int.mcmartin.ca>2006-01-10 21:53:14 -0500
commitf45adcf977ac3c5512c17fd97b073bda99c81232 (patch)
treeb6dedae336721d6f55836b17b27115ca66874352 /drivers/parisc/dino.c
parent4d62ce5d2a85976a2e6f2732980e59b21b2aa8d2 (diff)
downloadop-kernel-dev-f45adcf977ac3c5512c17fd97b073bda99c81232.zip
op-kernel-dev-f45adcf977ac3c5512c17fd97b073bda99c81232.tar.gz
[PARISC] Fix Dino reporting on J2240
Fix Dino reporting on J2240. This particular machine thought it had a Cujo. Also add J2240 Dino chip to the hp_hardware_list. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/parisc/dino.c')
-rw-r--r--drivers/parisc/dino.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 45a1a49..216d1d8 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -83,7 +83,8 @@
** bus number for each dino.
*/
-#define is_card_dino(id) ((id)->hw_type == HPHW_A_DMA)
+#define is_card_dino(id) ((id)->hw_type == HPHW_A_DMA)
+#define is_cujo(id) ((id)->hversion == 0x682)
#define DINO_IAR0 0x004
#define DINO_IODC_ADDR 0x008
@@ -682,7 +683,6 @@ dino_fixup_bus(struct pci_bus *bus)
printk(KERN_WARNING "Device %s has unassigned IRQ\n", pci_name(dev));
#endif
} else {
-
/* Adjust INT_LINE for that busses region */
dino_assign_irq(dino_dev, dev->irq, &dev->irq);
}
@@ -888,7 +888,7 @@ static int __init dino_common_init(struct parisc_device *dev,
/* allocate I/O Port resource region */
res = &dino_dev->hba.io_space;
- if (dev->id.hversion == 0x680 || is_card_dino(&dev->id)) {
+ if (!is_cujo(&dev->id)) {
res->name = "Dino I/O Port";
} else {
res->name = "Cujo I/O Port";
@@ -943,7 +943,7 @@ static int __init dino_probe(struct parisc_device *dev)
if (is_card_dino(&dev->id)) {
version = "3.x (card mode)";
} else {
- if(dev->id.hversion == 0x680) {
+ if (!is_cujo(&dev->id)) {
if (dev->id.hversion_rev < 4) {
version = dino_vers[dev->id.hversion_rev];
}
OpenPOWER on IntegriCloud