66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
122 lines
3.2 KiB
C
122 lines
3.2 KiB
C
/***************************************************************************/
|
|
|
|
/*
|
|
* linux/arch/m68knommu/platform/5407/config.c
|
|
*
|
|
* Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
|
|
* Copyright (C) 2000, Lineo (www.lineo.com)
|
|
*/
|
|
|
|
/***************************************************************************/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/param.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/coldfire.h>
|
|
#include <asm/mcfsim.h>
|
|
#include <asm/mcfuart.h>
|
|
|
|
/***************************************************************************/
|
|
|
|
static struct mcf_platform_uart m5407_uart_platform[] = {
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE1,
|
|
.irq = 73,
|
|
},
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE2,
|
|
.irq = 74,
|
|
},
|
|
{ },
|
|
};
|
|
|
|
static struct platform_device m5407_uart = {
|
|
.name = "mcfuart",
|
|
.id = 0,
|
|
.dev.platform_data = m5407_uart_platform,
|
|
};
|
|
|
|
static struct platform_device *m5407_devices[] __initdata = {
|
|
&m5407_uart,
|
|
};
|
|
|
|
/***************************************************************************/
|
|
|
|
static void __init m5407_uart_init_line(int line, int irq)
|
|
{
|
|
if (line == 0) {
|
|
writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
|
|
writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
|
|
mcf_mapirq2imr(irq, MCFINTC_UART0);
|
|
} else if (line == 1) {
|
|
writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
|
|
writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
|
|
mcf_mapirq2imr(irq, MCFINTC_UART1);
|
|
}
|
|
}
|
|
|
|
static void __init m5407_uarts_init(void)
|
|
{
|
|
const int nrlines = ARRAY_SIZE(m5407_uart_platform);
|
|
int line;
|
|
|
|
for (line = 0; (line < nrlines); line++)
|
|
m5407_uart_init_line(line, m5407_uart_platform[line].irq);
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
static void __init m5407_timers_init(void)
|
|
{
|
|
/* Timer1 is always used as system timer */
|
|
writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI3,
|
|
MCF_MBAR + MCFSIM_TIMER1ICR);
|
|
mcf_mapirq2imr(MCF_IRQ_TIMER, MCFINTC_TIMER1);
|
|
|
|
#ifdef CONFIG_HIGHPROFILE
|
|
/* Timer2 is to be used as a high speed profile timer */
|
|
writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL7 | MCFSIM_ICR_PRI3,
|
|
MCF_MBAR + MCFSIM_TIMER2ICR);
|
|
mcf_mapirq2imr(MCF_IRQ_PROFILER, MCFINTC_TIMER2);
|
|
#endif
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
void m5407_cpu_reset(void)
|
|
{
|
|
local_irq_disable();
|
|
/* set watchdog to soft reset, and enabled */
|
|
__raw_writeb(0xc0, MCF_MBAR + MCFSIM_SYPCR);
|
|
for (;;)
|
|
/* wait for watchdog to timeout */;
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
void __init config_BSP(char *commandp, int size)
|
|
{
|
|
mach_reset = m5407_cpu_reset;
|
|
m5407_timers_init();
|
|
m5407_uarts_init();
|
|
|
|
/* Only support the external interrupts on their primary level */
|
|
mcf_mapirq2imr(25, MCFINTC_EINT1);
|
|
mcf_mapirq2imr(27, MCFINTC_EINT3);
|
|
mcf_mapirq2imr(29, MCFINTC_EINT5);
|
|
mcf_mapirq2imr(31, MCFINTC_EINT7);
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
static int __init init_BSP(void)
|
|
{
|
|
platform_add_devices(m5407_devices, ARRAY_SIZE(m5407_devices));
|
|
return 0;
|
|
}
|
|
|
|
arch_initcall(init_BSP);
|
|
|
|
/***************************************************************************/
|