diff options
| author | Ryan Bradetich <rbrad@parisc-linux.org> | 2006-11-03 05:05:01 +0000 |
|---|---|---|
| committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:34:02 -0500 |
| commit | 075b8783da0db700868c7b391636a85c06a89678 (patch) | |
| tree | 1181dd66f2c3c47dcbcc1ad3d4ab402dcb8a6e37 /drivers/parisc/hppb.c | |
| parent | 328d968e4fbbd439760c04de95998faeb092a9ed (diff) | |
[PARISC] HPPB bus updates for E-Class systems
This patch addresses the following issues:
* Removes an incorrect comment.
* Fixes a couple of compiler warnings.
* Properly detects the HP-PB bus on E-Class systems.
Signed-off-by: Ryan Bradetich <rbrad@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/parisc/hppb.c')
| -rw-r--r-- | drivers/parisc/hppb.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 07dc2b6d4e93..9bb4db552f3c 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c @@ -10,10 +10,6 @@ ** the Free Software Foundation; either version 2 of the License, or ** (at your option) any later version. ** -** This Driver currently only supports the console (port 0) on the MUX. -** Additional work will be needed on this driver to enable the full -** functionality of the MUX. -** */ #include <linux/types.h> @@ -67,7 +63,7 @@ static int hppb_probe(struct parisc_device *dev) } card = card->next; } - printk(KERN_INFO "Found GeckoBoa at 0x%lx\n", dev->hpa.start); + printk(KERN_INFO "Found GeckoBoa at 0x%x\n", dev->hpa.start); card->hpa = dev->hpa.start; card->mmio_region.name = "HP-PB Bus"; @@ -78,16 +74,18 @@ static int hppb_probe(struct parisc_device *dev) status = ccio_request_resource(dev, &card->mmio_region); if(status < 0) { - printk(KERN_ERR "%s: failed to claim HP-PB bus space (%08lx, %08lx)\n", + printk(KERN_ERR "%s: failed to claim HP-PB bus space (%08x, %08x)\n", __FILE__, card->mmio_region.start, card->mmio_region.end); } return 0; } - static struct parisc_device_id hppb_tbl[] = { - { HPHW_BCPORT, HVERSION_REV_ANY_ID, 0x500, 0xc }, + { HPHW_BCPORT, HVERSION_REV_ANY_ID, 0x500, 0xc }, /* E25 and K */ + { HPHW_BCPORT, 0x0, 0x501, 0xc }, /* E35 */ + { HPHW_BCPORT, 0x0, 0x502, 0xc }, /* E45 */ + { HPHW_BCPORT, 0x0, 0x503, 0xc }, /* E55 */ { 0, } }; |