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

Commit 4060bbe9 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle
Browse files

MIPS: Move gic.h to include/linux/irqchip/mips-gic.h 



Now that the MIPS GIC irqchip lives in drivers/irqchip/, move
its header over to include/linux/irqchip/.

Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8129/


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

arch/mips/include/asm/mips-boards/maltaint.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifndef _MIPS_MALTAINT_H

#define _MIPS_MALTAINT_H



#include <asm/gic.h>

#include <linux/irqchip/mips-gic.h>



/*

 * Interrupts 0..15 are used for Malta ISA compatible interrupts

arch/mips/include/asm/mips-boards/sead3int.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifndef _MIPS_SEAD3INT_H

#define _MIPS_SEAD3INT_H



#include <asm/gic.h>

#include <linux/irqchip/mips-gic.h>



/* SEAD-3 GIC address space definitions. */

#define GIC_BASE_ADDR		0x1b1c0000

arch/mips/kernel/cevt-gic.c

+1 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
#include <linux/percpu.h>

#include <linux/smp.h>

#include <linux/irq.h>

#include <linux/irqchip/mips-gic.h>



#include <asm/time.h>

#include <asm/gic.h>

#include <asm/mips-boards/maltaint.h>



DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);

arch/mips/kernel/cevt-r4k.c

+1 −1
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#include <linux/percpu.h>

#include <linux/smp.h>

#include <linux/irq.h>

#include <linux/irqchip/mips-gic.h>



#include <asm/time.h>

#include <asm/cevt-r4k.h>

#include <asm/gic.h>



static int mips_next_event(unsigned long delta,

			   struct clock_event_device *evt)

arch/mips/kernel/csrc-gic.c

+1 −2
Original line number Diff line number Diff line
@@ -6,10 +6,9 @@ 
 * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.

 */

#include <linux/init.h>

#include <linux/irqchip/mips-gic.h>

#include <linux/time.h>



#include <asm/gic.h>



static cycle_t gic_hpt_read(struct clocksource *cs)

{

	return gic_read_count();