sh: intc: unify evt2irq/irq2evt macros for sh and arm
Move evt2irq and irq2evt macros definitions out of sh and arm includes into a common location. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
parent
bc0a15171a
commit
7f1e76370b
|
@ -100,6 +100,10 @@ config MACH_MARZEN
|
||||||
|
|
||||||
comment "SH-Mobile System Configuration"
|
comment "SH-Mobile System Configuration"
|
||||||
|
|
||||||
|
config CPU_HAS_INTEVT
|
||||||
|
bool
|
||||||
|
default y
|
||||||
|
|
||||||
menu "Memory configuration"
|
menu "Memory configuration"
|
||||||
|
|
||||||
config MEMORY_START
|
config MEMORY_START
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
#ifndef __ASM_MACH_IRQS_H
|
#ifndef __ASM_MACH_IRQS_H
|
||||||
#define __ASM_MACH_IRQS_H
|
#define __ASM_MACH_IRQS_H
|
||||||
|
|
||||||
|
#include <linux/sh_intc.h>
|
||||||
|
|
||||||
#define NR_IRQS 1024
|
#define NR_IRQS 1024
|
||||||
|
|
||||||
/* GIC */
|
/* GIC */
|
||||||
#define gic_spi(nr) ((nr) + 32)
|
#define gic_spi(nr) ((nr) + 32)
|
||||||
|
|
||||||
/* INTCA */
|
|
||||||
#define evt2irq(evt) (((evt) >> 5) - 16)
|
|
||||||
#define irq2evt(irq) (((irq) + 16) << 5)
|
|
||||||
|
|
||||||
/* INTCS */
|
/* INTCS */
|
||||||
#define INTCS_VECT_BASE 0x2200
|
#define INTCS_VECT_BASE 0x2200
|
||||||
#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
|
#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
|
||||||
|
|
|
@ -20,17 +20,6 @@
|
||||||
*/
|
*/
|
||||||
#define NO_IRQ_IGNORE ((unsigned int)-1)
|
#define NO_IRQ_IGNORE ((unsigned int)-1)
|
||||||
|
|
||||||
/*
|
|
||||||
* Convert back and forth between INTEVT and IRQ values.
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_CPU_HAS_INTEVT
|
|
||||||
#define evt2irq(evt) (((evt) >> 5) - 16)
|
|
||||||
#define irq2evt(irq) (((irq) + 16) << 5)
|
|
||||||
#else
|
|
||||||
#define evt2irq(evt) (evt)
|
|
||||||
#define irq2evt(irq) (irq)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Simple Mask Register Support
|
* Simple Mask Register Support
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -3,6 +3,17 @@
|
||||||
|
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Convert back and forth between INTEVT and IRQ values.
|
||||||
|
*/
|
||||||
|
#ifdef CONFIG_CPU_HAS_INTEVT
|
||||||
|
#define evt2irq(evt) (((evt) >> 5) - 16)
|
||||||
|
#define irq2evt(irq) (((irq) + 16) << 5)
|
||||||
|
#else
|
||||||
|
#define evt2irq(evt) (evt)
|
||||||
|
#define irq2evt(irq) (irq)
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef unsigned char intc_enum;
|
typedef unsigned char intc_enum;
|
||||||
|
|
||||||
struct intc_vect {
|
struct intc_vect {
|
||||||
|
|
Loading…
Reference in a new issue