aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-05-05 21:36:00 -0400
committerGreg Ungerer <gerg@uclinux.org>2009-09-15 19:43:47 -0400
commitf1a59d244abd8d7b94b90f45ee5e0988e5a154cb (patch)
tree7e809b6d848ff9a4a9b9618c9e4df338d055c860 /arch/m68k
parenta3d9bf1dfdaf6f7df6c5340521dff1aafe39393f (diff)
m68knommu: remove interrupt masking from ColdFire pit timer
With proper interrupt controller code in place there is no need for devices like the timers to have custom interrupt masking code. Remove it (and the defines that go along with it). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/m520xsim.h4
-rw-r--r--arch/m68k/include/asm/mcfsim.h14
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/m68k/include/asm/m520xsim.h b/arch/m68k/include/asm/m520xsim.h
index 91de39c8d865..ed2b69b96805 100644
--- a/arch/m68k/include/asm/m520xsim.h
+++ b/arch/m68k/include/asm/m520xsim.h
@@ -124,10 +124,6 @@
124#define MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2 (0x02) 124#define MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2 (0x02)
125#define MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 (0x04) 125#define MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 (0x04)
126 126
127#define ICR_INTRCONF 0x05
128#define MCFPIT_IMR MCFINTC_IMRL
129#define MCFPIT_IMR_IBIT (1 << MCFINT_PIT1)
130
131/* 127/*
132 * Reset Controll Unit. 128 * Reset Controll Unit.
133 */ 129 */
diff --git a/arch/m68k/include/asm/mcfsim.h b/arch/m68k/include/asm/mcfsim.h
index da3f2ceff3a4..b90425fb50fe 100644
--- a/arch/m68k/include/asm/mcfsim.h
+++ b/arch/m68k/include/asm/mcfsim.h
@@ -101,20 +101,6 @@
101#endif 101#endif
102 102
103 103
104/*
105 * PIT interrupt settings, if not found in mXXXXsim.h file.
106 */
107#ifndef ICR_INTRCONF
108#define ICR_INTRCONF 0x2b /* PIT1 level 5, priority 3 */
109#endif
110#ifndef MCFPIT_IMR
111#define MCFPIT_IMR MCFINTC_IMRH
112#endif
113#ifndef MCFPIT_IMR_IBIT
114#define MCFPIT_IMR_IBIT (1 << (MCFINT_PIT1 - 32))
115#endif
116
117
118#ifndef __ASSEMBLY__ 104#ifndef __ASSEMBLY__
119/* 105/*
120 * Definition for the interrupt auto-vectoring support. 106 * Definition for the interrupt auto-vectoring support.