diff options
author | Greg Ungerer <gerg@uclinux.org> | 2009-04-28 01:59:10 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-15 19:43:42 -0400 |
commit | 1f946533bb562f5144752ea583cac45e9410fdaa (patch) | |
tree | 44d209fe78145f436811d9bdb936e9a70fe0f40a /arch/m68knommu | |
parent | 980f9235eba5091d9fbbeb7fb72348c19d1ba710 (diff) |
m68knommu: clean up ColdFire 523x interrupt setup
With the common intc-2 interrupt controller code in place the ColdFire
523x family startup code can be greatly simplified. Remove all the
interrupt masking code, and the per-device interrupt config here.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/platform/523x/config.c | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/arch/m68knommu/platform/523x/config.c b/arch/m68knommu/platform/523x/config.c index 961fefebca14..00f08d2e43b0 100644 --- a/arch/m68knommu/platform/523x/config.c +++ b/arch/m68knommu/platform/523x/config.c | |||
@@ -82,66 +82,6 @@ static struct platform_device *m523x_devices[] __initdata = { | |||
82 | 82 | ||
83 | /***************************************************************************/ | 83 | /***************************************************************************/ |
84 | 84 | ||
85 | #define INTC0 (MCF_MBAR + MCFICM_INTC0) | ||
86 | |||
87 | static void __init m523x_uart_init_line(int line, int irq) | ||
88 | { | ||
89 | u32 imr; | ||
90 | |||
91 | if ((line < 0) || (line > 2)) | ||
92 | return; | ||
93 | |||
94 | writeb(0x30+line, (INTC0 + MCFINTC_ICR0 + MCFINT_UART0 + line)); | ||
95 | |||
96 | imr = readl(INTC0 + MCFINTC_IMRL); | ||
97 | imr &= ~((1 << (irq - MCFINT_VECBASE)) | 1); | ||
98 | writel(imr, INTC0 + MCFINTC_IMRL); | ||
99 | } | ||
100 | |||
101 | static void __init m523x_uarts_init(void) | ||
102 | { | ||
103 | const int nrlines = ARRAY_SIZE(m523x_uart_platform); | ||
104 | int line; | ||
105 | |||
106 | for (line = 0; (line < nrlines); line++) | ||
107 | m523x_uart_init_line(line, m523x_uart_platform[line].irq); | ||
108 | } | ||
109 | |||
110 | /***************************************************************************/ | ||
111 | |||
112 | static void __init m523x_fec_init(void) | ||
113 | { | ||
114 | u32 imr; | ||
115 | |||
116 | /* Unmask FEC interrupts at ColdFire interrupt controller */ | ||
117 | writeb(0x28, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 23); | ||
118 | writeb(0x27, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 27); | ||
119 | writeb(0x26, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_ICR0 + 29); | ||
120 | |||
121 | imr = readl(MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRH); | ||
122 | imr &= ~0xf; | ||
123 | writel(imr, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRH); | ||
124 | imr = readl(MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRL); | ||
125 | imr &= ~0xff800001; | ||
126 | writel(imr, MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRL); | ||
127 | } | ||
128 | |||
129 | /***************************************************************************/ | ||
130 | |||
131 | void mcf_disableall(void) | ||
132 | { | ||
133 | *((volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRH)) = 0xffffffff; | ||
134 | *((volatile unsigned long *) (MCF_IPSBAR + MCFICM_INTC0 + MCFINTC_IMRL)) = 0xffffffff; | ||
135 | } | ||
136 | |||
137 | /***************************************************************************/ | ||
138 | |||
139 | void mcf_autovector(unsigned int vec) | ||
140 | { | ||
141 | /* Everything is auto-vectored on the 523x */ | ||
142 | } | ||
143 | /***************************************************************************/ | ||
144 | |||
145 | static void m523x_cpu_reset(void) | 85 | static void m523x_cpu_reset(void) |
146 | { | 86 | { |
147 | local_irq_disable(); | 87 | local_irq_disable(); |
@@ -152,10 +92,7 @@ static void m523x_cpu_reset(void) | |||
152 | 92 | ||
153 | void __init config_BSP(char *commandp, int size) | 93 | void __init config_BSP(char *commandp, int size) |
154 | { | 94 | { |
155 | mcf_disableall(); | ||
156 | mach_reset = m523x_cpu_reset; | 95 | mach_reset = m523x_cpu_reset; |
157 | m523x_uarts_init(); | ||
158 | m523x_fec_init(); | ||
159 | } | 96 | } |
160 | 97 | ||
161 | /***************************************************************************/ | 98 | /***************************************************************************/ |