diff options
| author | Greg Ungerer | 2009-05-19 06:38:08 +0200 |
|---|---|---|
| committer | Greg Ungerer | 2009-09-16 01:43:50 +0200 |
| commit | f2154bef817ac3d0ea67b52526fd8e88898b66f9 (patch) | |
| tree | 3ffa5cf5c3ec82a59f75728a580bd9332a32ebee /arch/m68k/include/asm/m5206sim.h | |
| parent | m68knommu: remove duplicate ColdFire mcf_autovector() code (diff) | |
| download | kernel-qcow2-linux-f2154bef817ac3d0ea67b52526fd8e88898b66f9.tar.gz kernel-qcow2-linux-f2154bef817ac3d0ea67b52526fd8e88898b66f9.tar.xz kernel-qcow2-linux-f2154bef817ac3d0ea67b52526fd8e88898b66f9.zip | |
m68knommu: merge old ColdFire interrupt controller masking macros
Currently the code that supports setting the old style ColdFire interrupt
controller mask registers is macros in the include files of each of the
CPU types. Merge all these into a set of real masking functions in the
old Coldfire interrupt controller code proper. All the macros are basically
the same (excepting a register size difference on really early parts).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/m5206sim.h')
| -rw-r--r-- | arch/m68k/include/asm/m5206sim.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/m68k/include/asm/m5206sim.h b/arch/m68k/include/asm/m5206sim.h index 7be8a2d3e659..b50061aaf8f0 100644 --- a/arch/m68k/include/asm/m5206sim.h +++ b/arch/m68k/include/asm/m5206sim.h @@ -117,21 +117,11 @@ #define MCFSIM_DMA2ICR MCFSIM_ICR15 /* DMA 2 ICR */ #endif -#if defined(CONFIG_M5206e) -#define MCFSIM_IMR_MASKALL 0xfffe /* All SIM intr sources */ -#endif - /* - * Macro to get and set IMR register. It is 16 bits on the 5206. + * Let the common interrupt handler code know that the ColdFire 5206* + * family of CPU's only has a 16bit sized IMR register. */ -#define mcf_getimr() \ - *((volatile unsigned short *) (MCF_MBAR + MCFSIM_IMR)) - -#define mcf_setimr(imr) \ - *((volatile unsigned short *) (MCF_MBAR + MCFSIM_IMR)) = (imr) - -#define mcf_getipr() \ - *((volatile unsigned short *) (MCF_MBAR + MCFSIM_IPR)) +#define MCFSIM_IMR_IS_16BITS /****************************************************************************/ #endif /* m5206sim_h */ |