diff options
-rw-r--r-- | arch/m68k/include/asm/m520xsim.h | 4 | ||||
-rw-r--r-- | arch/m68k/include/asm/mcfsim.h | 14 | ||||
-rw-r--r-- | arch/m68knommu/platform/coldfire/pit.c | 8 |
3 files changed, 0 insertions, 26 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. |
diff --git a/arch/m68knommu/platform/coldfire/pit.c b/arch/m68knommu/platform/coldfire/pit.c index 61b96211f8ff..d8720ee34510 100644 --- a/arch/m68knommu/platform/coldfire/pit.c +++ b/arch/m68knommu/platform/coldfire/pit.c | |||
@@ -32,7 +32,6 @@ | |||
32 | */ | 32 | */ |
33 | #define FREQ ((MCF_CLK / 2) / 64) | 33 | #define FREQ ((MCF_CLK / 2) / 64) |
34 | #define TA(a) (MCF_IPSBAR + MCFPIT_BASE1 + (a)) | 34 | #define TA(a) (MCF_IPSBAR + MCFPIT_BASE1 + (a)) |
35 | #define INTC0 (MCF_IPSBAR + MCFICM_INTC0) | ||
36 | #define PIT_CYCLES_PER_JIFFY (FREQ / HZ) | 35 | #define PIT_CYCLES_PER_JIFFY (FREQ / HZ) |
37 | 36 | ||
38 | static u32 pit_cnt; | 37 | static u32 pit_cnt; |
@@ -154,8 +153,6 @@ static struct clocksource pit_clk = { | |||
154 | 153 | ||
155 | void hw_timer_init(void) | 154 | void hw_timer_init(void) |
156 | { | 155 | { |
157 | u32 imr; | ||
158 | |||
159 | cf_pit_clockevent.cpumask = cpumask_of(smp_processor_id()); | 156 | cf_pit_clockevent.cpumask = cpumask_of(smp_processor_id()); |
160 | cf_pit_clockevent.mult = div_sc(FREQ, NSEC_PER_SEC, 32); | 157 | cf_pit_clockevent.mult = div_sc(FREQ, NSEC_PER_SEC, 32); |
161 | cf_pit_clockevent.max_delta_ns = | 158 | cf_pit_clockevent.max_delta_ns = |
@@ -166,11 +163,6 @@ void hw_timer_init(void) | |||
166 | 163 | ||
167 | setup_irq(MCFINT_VECBASE + MCFINT_PIT1, &pit_irq); | 164 | setup_irq(MCFINT_VECBASE + MCFINT_PIT1, &pit_irq); |
168 | 165 | ||
169 | __raw_writeb(ICR_INTRCONF, INTC0 + MCFINTC_ICR0 + MCFINT_PIT1); | ||
170 | imr = __raw_readl(INTC0 + MCFPIT_IMR); | ||
171 | imr &= ~MCFPIT_IMR_IBIT; | ||
172 | __raw_writel(imr, INTC0 + MCFPIT_IMR); | ||
173 | |||
174 | pit_clk.mult = clocksource_hz2mult(FREQ, pit_clk.shift); | 166 | pit_clk.mult = clocksource_hz2mult(FREQ, pit_clk.shift); |
175 | clocksource_register(&pit_clk); | 167 | clocksource_register(&pit_clk); |
176 | } | 168 | } |