Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71471e28 authored by Steven J. Hill's avatar Steven J. Hill Committed by Ralf Baechle
Browse files

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: default avatarSteven J. Hill <steven.hill@cavium.com>
Acked-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13824/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 20f06ed9

arch/mips/cavium-octeon/octeon-irq.c

+0 −12
Original line number Diff line number Diff line
@@ -1542,10 +1542,6 @@ static int __init octeon_irq_init_ciu( 
			goto err;

	}



	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);

	if (r)

		goto err;



	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59);

	if (r)

		goto err;
@@ -1559,10 +1555,6 @@ static int __init octeon_irq_init_ciu( 
			goto err;

	}



	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB1, 1, 17);

	if (r)

		goto err;



	/* Enable the CIU lines */

	set_c0_status(STATUSF_IP3 | STATUSF_IP2);

	if (octeon_irq_use_ip4)
@@ -2077,10 +2069,6 @@ static int __init octeon_irq_init_ciu2( 
			goto err;

	}



	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 3, 44);

	if (r)

		goto err;



	for (i = 0; i < 4; i++) {

		r = octeon_irq_force_ciu_mapping(

			ciu_domain, i + OCTEON_IRQ_PCI_INT0, 4, i);

arch/mips/include/asm/mach-cavium-octeon/irq.h

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ enum octeon_irq { 
	OCTEON_IRQ_TIMER1,

	OCTEON_IRQ_TIMER2,

	OCTEON_IRQ_TIMER3,

	OCTEON_IRQ_USB0,

	OCTEON_IRQ_USB1,

#ifndef CONFIG_PCI_MSI

	OCTEON_IRQ_LAST = 127

#endif