luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irqchip: mips-gic: Move gic_get_c0_*_int() to asm/mips-gic.h

Browse Source 
The linux/irqchip/mips-gic.h header is now almost empty. Move the
declarations of gic_get_c0_compare_int(), gic_get_c0_perfcount_int() &
gic_get_c0_fdc_int() to asm/mips-gic.h in order to close in on being
able to delete the former header.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17046/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2017-08-12 21:36:36 -07:00 committed by Ralf Baechle
parent 56d7b61dc6
commit dd0163508c
7 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/mips/generic/irq.c
View File

@ -12,7 +12,6 @@
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/init.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/types.h>
#include <asm/irq.h>

30
arch/mips/include/asm/mips-gic.h
View File

@ -314,4 +314,34 @@ static inline bool mips_gic_present(void)
return IS_ENABLED(CONFIG_MIPS_GIC) && mips_gic_base;
}
/**
* gic_get_c0_compare_int() - Return cp0 count/compare interrupt virq
*
* Determine the virq number to use for the coprocessor 0 count/compare
* interrupt, which may be routed via the GIC.
*
* Returns the virq number or a negative error number.
*/
extern int gic_get_c0_compare_int(void);
/**
* gic_get_c0_perfcount_int() - Return performance counter interrupt virq
*
* Determine the virq number to use for CPU performance counter interrupts,
* which may be routed via the GIC.
*
* Returns the virq number or a negative error number.
*/
extern int gic_get_c0_perfcount_int(void);
/**
* gic_get_c0_fdc_int() - Return fast debug channel interrupt virq
*
* Determine the virq number to use for fast debug channel (FDC) interrupts,
* which may be routed via the GIC.
*
* Returns the virq number or a negative error number.
*/
extern int gic_get_c0_fdc_int(void);
#endif /* __MIPS_ASM_MIPS_CPS_H__ */

1
arch/mips/mti-malta/malta-time.c
View File

@ -26,7 +26,6 @@
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/timex.h>
#include <linux/mc146818rtc.h>

2
arch/mips/pistachio/time.c
View File

@ -12,9 +12,9 @@
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/init.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/of.h>
#include <asm/mips-cps.h>
#include <asm/time.h>
unsigned int get_c0_compare_int(void)

2
arch/mips/ralink/irq-gic.c
View File

@ -11,7 +11,7 @@
#include <linux/of.h>
#include <linux/irqchip.h>
#include <linux/irqchip/mips-gic.h>
#include <asm/mips-cps.h>
int get_c0_perfcount_int(void)
{

1
drivers/irqchip/irq-mips-gic.c
View File

@ -12,7 +12,6 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/irqchip.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/of_address.h>
#include <linux/sched.h>
#include <linux/smp.h>

8
include/linux/irqchip/mips-gic.h
View File

@ -15,12 +15,4 @@
#define GIC_UMV_SH_COUNTER_31_00_OFS 0x0000
#define GIC_UMV_SH_COUNTER_63_32_OFS 0x0004
#ifdef CONFIG_MIPS_GIC
extern int gic_get_c0_compare_int(void);
extern int gic_get_c0_perfcount_int(void);
extern int gic_get_c0_fdc_int(void);
#endif /* CONFIG_MIPS_GIC */
#endif /* __LINUX_IRQCHIP_MIPS_GIC_H */