android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sh: intc: unify evt2irq/irq2evt macros for sh and arm

Browse Source 
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:
Rob Herring 2012-01-17 11:20:23 -06:00
parent bc0a15171a
commit 7f1e76370b
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-shmobile/Kconfig
View File

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

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

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

11
arch/sh/include/asm/irq.h
View File

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

11
include/linux/sh_intc.h
View File

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