lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas@verge.net.au: omitted whitespace change]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Geert Uytterhoeven 2014-08-20 15:39:23 +02:00 committed by Simon Horman
parent 664b4c1722
commit 86155b35d1
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/board-kzm9g.c
View File

@ -50,6 +50,7 @@
#include <video/sh_mobile_lcdc.h>
#include "common.h"
#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"

1
arch/arm/mach-shmobile/board-mackerel.c
View File

@ -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"

5
arch/arm/mach-shmobile/intc.h
View File

@ -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 */

6
arch/arm/mach-shmobile/irqs.h
View File

@ -1,18 +1,12 @@
#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))

1
arch/arm/mach-shmobile/setup-sh7372.c
View File

@ -41,6 +41,7 @@
#include "common.h"
#include "dma-register.h"
#include "intc.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh7372.h"

1
arch/arm/mach-shmobile/setup-sh73a0.c
View File

@ -40,6 +40,7 @@
#include "common.h"
#include "dma-register.h"
#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"