.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
---|
1 | 2 | /* |
---|
2 | 3 | * eisa.c - provide support for EISA adapters in PA-RISC machines |
---|
3 | | - * |
---|
4 | | - * This program is free software; you can redistribute it and/or |
---|
5 | | - * modify it under the terms of the GNU General Public License |
---|
6 | | - * as published by the Free Software Foundation; either version |
---|
7 | | - * 2 of the License, or (at your option) any later version. |
---|
8 | 4 | * |
---|
9 | 5 | * Copyright (c) 2001 Matthew Wilcox for Hewlett Packard |
---|
10 | 6 | * Copyright (c) 2001 Daniel Engstrom <5116@telia.com> |
---|
.. | .. |
---|
14 | 10 | * Wax ASIC also includes a PS/2 and RS-232 controller, but those are |
---|
15 | 11 | * dealt with elsewhere; this file is concerned only with the EISA portions |
---|
16 | 12 | * of Wax. |
---|
17 | | - * |
---|
18 | 13 | * |
---|
19 | 14 | * HINT: |
---|
20 | 15 | * ----- |
---|
.. | .. |
---|
44 | 39 | #include <asm/delay.h> |
---|
45 | 40 | #include <asm/eisa_bus.h> |
---|
46 | 41 | #include <asm/eisa_eeprom.h> |
---|
| 42 | + |
---|
| 43 | +#include "iommu.h" |
---|
47 | 44 | |
---|
48 | 45 | #if 0 |
---|
49 | 46 | #define EISA_DBG(msg, arg...) printk(KERN_DEBUG "eisa: " msg, ## arg) |
---|
.. | .. |
---|
246 | 243 | return IRQ_HANDLED; |
---|
247 | 244 | } |
---|
248 | 245 | |
---|
249 | | -static struct irqaction irq2_action = { |
---|
250 | | - .handler = dummy_irq2_handler, |
---|
251 | | - .name = "cascade", |
---|
252 | | -}; |
---|
253 | | - |
---|
254 | 246 | static void init_eisa_pic(void) |
---|
255 | 247 | { |
---|
256 | 248 | unsigned long flags; |
---|
.. | .. |
---|
338 | 330 | } |
---|
339 | 331 | |
---|
340 | 332 | /* Reserve IRQ2 */ |
---|
341 | | - setup_irq(2, &irq2_action); |
---|
| 333 | + if (request_irq(2, dummy_irq2_handler, 0, "cascade", NULL)) |
---|
| 334 | + pr_err("Failed to request irq 2 (cascade)\n"); |
---|
342 | 335 | for (i = 0; i < 16; i++) { |
---|
343 | 336 | irq_set_chip_and_handler(i, &eisa_interrupt_type, |
---|
344 | 337 | handle_simple_irq); |
---|
.. | .. |
---|
357 | 350 | eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR; |
---|
358 | 351 | } |
---|
359 | 352 | } |
---|
360 | | - eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH); |
---|
| 353 | + eisa_eeprom_addr = ioremap(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH); |
---|
361 | 354 | if (!eisa_eeprom_addr) { |
---|
362 | 355 | result = -ENOMEM; |
---|
363 | | - printk(KERN_ERR "EISA: ioremap_nocache failed!\n"); |
---|
| 356 | + printk(KERN_ERR "EISA: ioremap failed!\n"); |
---|
364 | 357 | goto error_free_irq; |
---|
365 | 358 | } |
---|
366 | 359 | result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space, |
---|