Unverified Commit 390d1b46 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Paul Burton
Browse files

MIPS: lantiq: Use CP0_LEGACY_COMPARE_IRQ 



Instead of using the lantiq specific MIPS_CPU_TIMER_IRQ use the generic
CP0_LEGACY_COMPARE_IRQ constant for the timer interrupt number.
MIPS_CPU_TIMER_IRQ was already defined to 7 for both supported SoC
families.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: jhogan@kernel.org
Cc: ralf@linux-mips.org
Cc: john@phrozen.org
Cc: linux-mips@linux-mips.org
Cc: linux-mips@vger.kernel.org
parent 2b4dba55

arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#define INT_NUM_EXTRA_START		(INT_NUM_IM4_IRL0 + 32)

#define INT_NUM_IM_OFFSET		(INT_NUM_IM1_IRL0 - INT_NUM_IM0_IRL0)



#define MIPS_CPU_TIMER_IRQ			7



#define MAX_IM			5



#endif /* _FALCON_IRQ__ */

arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 


#define LTQ_DMA_CH0_INT		(INT_NUM_IM2_IRL0)



#define MIPS_CPU_TIMER_IRQ	7



#define MAX_IM			5



#endif

arch/mips/lantiq/irq.c

+1 −8
Original line number Diff line number Diff line
@@ -310,13 +310,6 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) 
	/* tell oprofile which irq to use */

	ltq_perfcount_irq = irq_create_mapping(ltq_domain, LTQ_PERF_IRQ);



	/*

	 * if the timer irq is not one of the mips irqs we need to

	 * create a mapping

	 */

	if (MIPS_CPU_TIMER_IRQ != 7)

		irq_create_mapping(ltq_domain, MIPS_CPU_TIMER_IRQ);



	/* the external interrupts are optional and xway only */

	eiu_node = of_find_compatible_node(NULL, NULL, "lantiq,eiu-xway");

	if (eiu_node && !of_address_to_resource(eiu_node, 0, &res)) {
@@ -353,7 +346,7 @@ EXPORT_SYMBOL_GPL(get_c0_perfcount_int); 


unsigned int get_c0_compare_int(void)

{

	return MIPS_CPU_TIMER_IRQ;

	return CP0_LEGACY_COMPARE_IRQ;

}



static struct of_device_id __initdata of_irq_ids[] = {