Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Octeon: Remove forced mappings of USB interrupts.

Get rid of unnecessary forced interrupt mappings for
the USB host controller on OCTEON II.

Signed-off-by: Steven J. Hill <steven.hill@cavium.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13824/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Steven J. Hill and committed by
Ralf Baechle
71471e28 20f06ed9

-14
-12
arch/mips/cavium-octeon/octeon-irq.c
··· 1542 1542 goto err; 1543 1543 } 1544 1544 1545 - r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56); 1546 - if (r) 1547 - goto err; 1548 - 1549 1545 r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59); 1550 1546 if (r) 1551 1547 goto err; ··· 1554 1558 if (r) 1555 1559 goto err; 1556 1560 } 1557 - 1558 - r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB1, 1, 17); 1559 - if (r) 1560 - goto err; 1561 1561 1562 1562 /* Enable the CIU lines */ 1563 1563 set_c0_status(STATUSF_IP3 | STATUSF_IP2); ··· 2068 2076 if (r) 2069 2077 goto err; 2070 2078 } 2071 - 2072 - r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 3, 44); 2073 - if (r) 2074 - goto err; 2075 2079 2076 2080 for (i = 0; i < 4; i++) { 2077 2081 r = octeon_irq_force_ciu_mapping(
-2
arch/mips/include/asm/mach-cavium-octeon/irq.h
··· 42 42 OCTEON_IRQ_TIMER1, 43 43 OCTEON_IRQ_TIMER2, 44 44 OCTEON_IRQ_TIMER3, 45 - OCTEON_IRQ_USB0, 46 - OCTEON_IRQ_USB1, 47 45 #ifndef CONFIG_PCI_MSI 48 46 OCTEON_IRQ_LAST = 127 49 47 #endif