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

Commit 86155b35 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h 



Move all definitions for legacy INTC from the common "irqs.h" to the
INTC-specific "intc.h".
Include "intc.h" in sh7372/sh73a0 CPU and board files where needed.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarMagnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: omitted whitespace change]
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 664b4c17

arch/arm/mach-shmobile/board-kzm9g.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <video/sh_mobile_lcdc.h>



#include "common.h"

#include "intc.h"

#include "irqs.h"

#include "sh73a0.h"

arch/arm/mach-shmobile/board-mackerel.c

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <asm/mach-types.h>



#include "common.h"

#include "intc.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh-gpio.h"

arch/arm/mach-shmobile/intc.h

+5 −0
Original line number Diff line number Diff line
@@ -287,4 +287,9 @@ static struct intc_desc p ## _desc __initdata = { \ 
			     p ## _sense_registers, NULL),		\

}



/* INTCS */

#define INTCS_VECT_BASE		0x3400

#define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))

#define intcs_evt2irq(evt)	evt2irq(INTCS_VECT_BASE + (evt))



#endif  /* __ASM_MACH_INTC_H */

arch/arm/mach-shmobile/irqs.h

+0 −6
Original line number Diff line number Diff line 
#ifndef __SHMOBILE_IRQS_H

#define __SHMOBILE_IRQS_H



#include <linux/sh_intc.h>

#include "include/mach/irqs.h"



/* GIC */

#define gic_spi(nr)		((nr) + 32)

#define gic_iid(nr)		(nr) /* ICCIAR / interrupt ID */



/* INTCS */

#define INTCS_VECT_BASE		0x3400

#define INTCS_VECT(n, vect)	INTC_VECT((n), INTCS_VECT_BASE + (vect))

#define intcs_evt2irq(evt)	evt2irq(INTCS_VECT_BASE + (evt))



/* GPIO IRQ */

#define _GPIO_IRQ_BASE		2500

#define GPIO_IRQ_BASE(x)	(_GPIO_IRQ_BASE + (32 * x))

arch/arm/mach-shmobile/setup-sh7372.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include "common.h"

#include "dma-register.h"

#include "intc.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh7372.h"