mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
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>
116 lines
2.7 KiB
C
116 lines
2.7 KiB
C
/***************************************************************************/
|
|
|
|
/*
|
|
* linux/arch/m68knommu/platform/54xx/config.c
|
|
*
|
|
* Copyright (C) 2010, Philippe De Muyter <phdm@macqel.be>
|
|
*/
|
|
|
|
/***************************************************************************/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/param.h>
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <asm/machdep.h>
|
|
#include <asm/coldfire.h>
|
|
#include <asm/m54xxsim.h>
|
|
#include <asm/mcfuart.h>
|
|
#include <asm/m54xxgpt.h>
|
|
|
|
/***************************************************************************/
|
|
|
|
static struct mcf_platform_uart m54xx_uart_platform[] = {
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE1,
|
|
.irq = 64 + 35,
|
|
},
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE2,
|
|
.irq = 64 + 34,
|
|
},
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE3,
|
|
.irq = 64 + 33,
|
|
},
|
|
{
|
|
.mapbase = MCF_MBAR + MCFUART_BASE4,
|
|
.irq = 64 + 32,
|
|
},
|
|
};
|
|
|
|
static struct platform_device m54xx_uart = {
|
|
.name = "mcfuart",
|
|
.id = 0,
|
|
.dev.platform_data = m54xx_uart_platform,
|
|
};
|
|
|
|
static struct platform_device *m54xx_devices[] __initdata = {
|
|
&m54xx_uart,
|
|
};
|
|
|
|
|
|
/***************************************************************************/
|
|
|
|
static void __init m54xx_uart_init_line(int line, int irq)
|
|
{
|
|
int rts_cts;
|
|
|
|
/* enable io pins */
|
|
switch (line) {
|
|
case 0:
|
|
rts_cts = 0; break;
|
|
case 1:
|
|
rts_cts = MCF_PAR_PSC_RTS_RTS; break;
|
|
case 2:
|
|
rts_cts = MCF_PAR_PSC_RTS_RTS | MCF_PAR_PSC_CTS_CTS; break;
|
|
case 3:
|
|
rts_cts = 0; break;
|
|
}
|
|
__raw_writeb(MCF_PAR_PSC_TXD | rts_cts | MCF_PAR_PSC_RXD,
|
|
MCF_MBAR + MCF_PAR_PSC(line));
|
|
}
|
|
|
|
static void __init m54xx_uarts_init(void)
|
|
{
|
|
const int nrlines = ARRAY_SIZE(m54xx_uart_platform);
|
|
int line;
|
|
|
|
for (line = 0; (line < nrlines); line++)
|
|
m54xx_uart_init_line(line, m54xx_uart_platform[line].irq);
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
static void mcf54xx_reset(void)
|
|
{
|
|
/* disable interrupts and enable the watchdog */
|
|
asm("movew #0x2700, %sr\n");
|
|
__raw_writel(0, MCF_MBAR + MCF_GPT_GMS0);
|
|
__raw_writel(MCF_GPT_GCIR_CNT(1), MCF_MBAR + MCF_GPT_GCIR0);
|
|
__raw_writel(MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE | MCF_GPT_GMS_TMS(4),
|
|
MCF_MBAR + MCF_GPT_GMS0);
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
void __init config_BSP(char *commandp, int size)
|
|
{
|
|
mach_reset = mcf54xx_reset;
|
|
m54xx_uarts_init();
|
|
}
|
|
|
|
/***************************************************************************/
|
|
|
|
static int __init init_BSP(void)
|
|
{
|
|
|
|
platform_add_devices(m54xx_devices, ARRAY_SIZE(m54xx_devices));
|
|
return 0;
|
|
}
|
|
|
|
arch_initcall(init_BSP);
|
|
|
|
/***************************************************************************/
|