diff options
Diffstat (limited to 'arch/m68k/platform/coldfire')
-rw-r--r-- | arch/m68k/platform/coldfire/Makefile | 2 | ||||
-rw-r--r-- | arch/m68k/platform/coldfire/m53xx.c (renamed from arch/m68k/platform/coldfire/m532x.c) | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/platform/coldfire/Makefile index 02591a109f8c..68f0fac60099 100644 --- a/arch/m68k/platform/coldfire/Makefile +++ b/arch/m68k/platform/coldfire/Makefile | |||
@@ -25,7 +25,7 @@ obj-$(CONFIG_M527x) += m527x.o pit.o intc-2.o reset.o | |||
25 | obj-$(CONFIG_M5272) += m5272.o intc-5272.o timers.o | 25 | obj-$(CONFIG_M5272) += m5272.o intc-5272.o timers.o |
26 | obj-$(CONFIG_M528x) += m528x.o pit.o intc-2.o reset.o | 26 | obj-$(CONFIG_M528x) += m528x.o pit.o intc-2.o reset.o |
27 | obj-$(CONFIG_M5307) += m5307.o timers.o intc.o reset.o | 27 | obj-$(CONFIG_M5307) += m5307.o timers.o intc.o reset.o |
28 | obj-$(CONFIG_M532x) += m532x.o timers.o intc-simr.o reset.o | 28 | obj-$(CONFIG_M53xx) += m53xx.o timers.o intc-simr.o reset.o |
29 | obj-$(CONFIG_M5407) += m5407.o timers.o intc.o reset.o | 29 | obj-$(CONFIG_M5407) += m5407.o timers.o intc.o reset.o |
30 | obj-$(CONFIG_M54xx) += m54xx.o sltimers.o intc-2.o | 30 | obj-$(CONFIG_M54xx) += m54xx.o sltimers.o intc-2.o |
31 | obj-$(CONFIG_M5441x) += m5441x.o pit.o intc-simr.o reset.o | 31 | obj-$(CONFIG_M5441x) += m5441x.o pit.o intc-simr.o reset.o |
diff --git a/arch/m68k/platform/coldfire/m532x.c b/arch/m68k/platform/coldfire/m53xx.c index 7951d1d43357..638382e6bc62 100644 --- a/arch/m68k/platform/coldfire/m532x.c +++ b/arch/m68k/platform/coldfire/m53xx.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /***************************************************************************/ | 1 | /***************************************************************************/ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * linux/arch/m68knommu/platform/532x/config.c | 4 | * m53xx.c -- platform support for ColdFire 53xx based boards |
5 | * | 5 | * |
6 | * Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com) | 6 | * Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com) |
7 | * Copyright (C) 2000, Lineo (www.lineo.com) | 7 | * Copyright (C) 2000, Lineo (www.lineo.com) |
@@ -153,7 +153,7 @@ static struct clk * const disable_clks[] __initconst = { | |||
153 | }; | 153 | }; |
154 | 154 | ||
155 | 155 | ||
156 | static void __init m532x_clk_init(void) | 156 | static void __init m53xx_clk_init(void) |
157 | { | 157 | { |
158 | unsigned i; | 158 | unsigned i; |
159 | 159 | ||
@@ -169,7 +169,7 @@ static void __init m532x_clk_init(void) | |||
169 | 169 | ||
170 | #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) | 170 | #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) |
171 | 171 | ||
172 | static void __init m532x_qspi_init(void) | 172 | static void __init m53xx_qspi_init(void) |
173 | { | 173 | { |
174 | /* setup QSPS pins for QSPI with gpio CS control */ | 174 | /* setup QSPS pins for QSPI with gpio CS control */ |
175 | writew(0x01f0, MCFGPIO_PAR_QSPI); | 175 | writew(0x01f0, MCFGPIO_PAR_QSPI); |
@@ -179,7 +179,7 @@ static void __init m532x_qspi_init(void) | |||
179 | 179 | ||
180 | /***************************************************************************/ | 180 | /***************************************************************************/ |
181 | 181 | ||
182 | static void __init m532x_uarts_init(void) | 182 | static void __init m53xx_uarts_init(void) |
183 | { | 183 | { |
184 | /* UART GPIO initialization */ | 184 | /* UART GPIO initialization */ |
185 | writew(readw(MCFGPIO_PAR_UART) | 0x0FFF, MCFGPIO_PAR_UART); | 185 | writew(readw(MCFGPIO_PAR_UART) | 0x0FFF, MCFGPIO_PAR_UART); |
@@ -187,7 +187,7 @@ static void __init m532x_uarts_init(void) | |||
187 | 187 | ||
188 | /***************************************************************************/ | 188 | /***************************************************************************/ |
189 | 189 | ||
190 | static void __init m532x_fec_init(void) | 190 | static void __init m53xx_fec_init(void) |
191 | { | 191 | { |
192 | u8 v; | 192 | u8 v; |
193 | 193 | ||
@@ -217,11 +217,11 @@ void __init config_BSP(char *commandp, int size) | |||
217 | } | 217 | } |
218 | #endif | 218 | #endif |
219 | mach_sched_init = hw_timer_init; | 219 | mach_sched_init = hw_timer_init; |
220 | m532x_clk_init(); | 220 | m53xx_clk_init(); |
221 | m532x_uarts_init(); | 221 | m53xx_uarts_init(); |
222 | m532x_fec_init(); | 222 | m53xx_fec_init(); |
223 | #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) | 223 | #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) |
224 | m532x_qspi_init(); | 224 | m53xx_qspi_init(); |
225 | #endif | 225 | #endif |
226 | 226 | ||
227 | #ifdef CONFIG_BDM_DISABLE | 227 | #ifdef CONFIG_BDM_DISABLE |