diff options
-rw-r--r-- | arch/m68knommu/platform/532x/config.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/m68knommu/platform/532x/config.c b/arch/m68knommu/platform/532x/config.c index 28eb9ea55f42..3d5855995888 100644 --- a/arch/m68knommu/platform/532x/config.c +++ b/arch/m68knommu/platform/532x/config.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/param.h> | 21 | #include <linux/param.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/interrupt.h> | ||
24 | #include <linux/io.h> | 23 | #include <linux/io.h> |
25 | #include <asm/machdep.h> | 24 | #include <asm/machdep.h> |
26 | #include <asm/coldfire.h> | 25 | #include <asm/coldfire.h> |
@@ -98,18 +97,11 @@ static struct platform_device *m532x_devices[] __initdata = { | |||
98 | static void __init m532x_uart_init_line(int line, int irq) | 97 | static void __init m532x_uart_init_line(int line, int irq) |
99 | { | 98 | { |
100 | if (line == 0) { | 99 | if (line == 0) { |
101 | MCF_INTC0_ICR26 = 0x3; | ||
102 | MCF_INTC0_CIMR = 26; | ||
103 | /* GPIO initialization */ | 100 | /* GPIO initialization */ |
104 | MCF_GPIO_PAR_UART |= 0x000F; | 101 | MCF_GPIO_PAR_UART |= 0x000F; |
105 | } else if (line == 1) { | 102 | } else if (line == 1) { |
106 | MCF_INTC0_ICR27 = 0x3; | ||
107 | MCF_INTC0_CIMR = 27; | ||
108 | /* GPIO initialization */ | 103 | /* GPIO initialization */ |
109 | MCF_GPIO_PAR_UART |= 0x0FF0; | 104 | MCF_GPIO_PAR_UART |= 0x0FF0; |
110 | } else if (line == 2) { | ||
111 | MCF_INTC0_ICR28 = 0x3; | ||
112 | MCF_INTC0_CIMR = 28; | ||
113 | } | 105 | } |
114 | } | 106 | } |
115 | 107 | ||
@@ -125,14 +117,6 @@ static void __init m532x_uarts_init(void) | |||
125 | 117 | ||
126 | static void __init m532x_fec_init(void) | 118 | static void __init m532x_fec_init(void) |
127 | { | 119 | { |
128 | /* Unmask FEC interrupts at ColdFire interrupt controller */ | ||
129 | MCF_INTC0_ICR36 = 0x2; | ||
130 | MCF_INTC0_ICR40 = 0x2; | ||
131 | MCF_INTC0_ICR42 = 0x2; | ||
132 | |||
133 | MCF_INTC0_IMRH &= ~(MCF_INTC_IMRH_INT_MASK36 | | ||
134 | MCF_INTC_IMRH_INT_MASK40 | MCF_INTC_IMRH_INT_MASK42); | ||
135 | |||
136 | /* Set multi-function pins to ethernet mode for fec0 */ | 120 | /* Set multi-function pins to ethernet mode for fec0 */ |
137 | MCF_GPIO_PAR_FECI2C |= (MCF_GPIO_PAR_FECI2C_PAR_MDC_EMDC | | 121 | MCF_GPIO_PAR_FECI2C |= (MCF_GPIO_PAR_FECI2C_PAR_MDC_EMDC | |
138 | MCF_GPIO_PAR_FECI2C_PAR_MDIO_EMDIO); | 122 | MCF_GPIO_PAR_FECI2C_PAR_MDIO_EMDIO); |
@@ -172,8 +156,6 @@ static void m532x_cpu_reset(void) | |||
172 | 156 | ||
173 | void __init config_BSP(char *commandp, int size) | 157 | void __init config_BSP(char *commandp, int size) |
174 | { | 158 | { |
175 | mcf_setimr(MCFSIM_IMR_MASKALL); | ||
176 | |||
177 | #if !defined(CONFIG_BOOTPARAM) | 159 | #if !defined(CONFIG_BOOTPARAM) |
178 | /* Copy command line from FLASH to local buffer... */ | 160 | /* Copy command line from FLASH to local buffer... */ |
179 | memcpy(commandp, (char *) 0x4000, 4); | 161 | memcpy(commandp, (char *) 0x4000, 4); |