The patch titled m68knommu: platform setup for 5272 ColdFire UARTs has been removed from the -mm tree. Its filename was m68knommu-platform-setup-for-5272-coldfire-uarts.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: m68knommu: platform setup for 5272 ColdFire UARTs From: Greg Ungerer <gerg@xxxxxxxxxxxx> Switch to platform style configuration for 5272 ColdFire UARTs. Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/m68knommu/platform/5272/config.c | 76 +++++++++++++++++++++--- 1 file changed, 69 insertions(+), 7 deletions(-) diff -puN arch/m68knommu/platform/5272/config.c~m68knommu-platform-setup-for-5272-coldfire-uarts arch/m68knommu/platform/5272/config.c --- a/arch/m68knommu/platform/5272/config.c~m68knommu-platform-setup-for-5272-coldfire-uarts +++ a/arch/m68knommu/platform/5272/config.c @@ -13,11 +13,12 @@ #include <linux/param.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <asm/dma.h> #include <asm/machdep.h> +#include <asm/dma.h> +#include <asm/io.h> #include <asm/coldfire.h> #include <asm/mcfsim.h> -#include <asm/mcfdma.h> +#include <asm/mcfuart.h> /***************************************************************************/ @@ -48,6 +49,60 @@ unsigned int dma_device_address[MAX_M68K /***************************************************************************/ +static struct mcf_platform_uart m5272_uart_platform[] = { + { + .mapbase = MCF_MBAR + MCFUART_BASE1, + .irq = 73, + }, + { + .mapbase = MCF_MBAR + MCFUART_BASE2, + .irq = 74, + }, + { }, +}; + +static struct platform_device m5272_uart = { + .name = "mcfuart", + .id = 0, + .dev.platform_data = m5272_uart_platform, +}; + +static struct platform_device *m5272_devices[] __initdata = { + &m5272_uart, +}; + +/***************************************************************************/ + +static void __init m5272_uart_init_line(int line, int irq) +{ + u32 v; + + if ((line >= 0) && (line < 2)) { + v = (line) ? 0x0e000000 : 0xe0000000; + writel(v, MCF_MBAR + MCFSIM_ICR2); + + /* Enable the output lines for the serial ports */ + v = readl(MCF_MBAR + MCFSIM_PBCNT); + v = (v & ~0x000000ff) | 0x00000055; + writel(v, MCF_MBAR + MCFSIM_PBCNT); + + v = readl(MCF_MBAR + MCFSIM_PDCNT); + v = (v & ~0x000003fc) | 0x000002a8; + writel(v, MCF_MBAR + MCFSIM_PDCNT); + } +} + +static void __init m5272_uarts_init(void) +{ + const int nrlines = ARRAY_SIZE(m5272_uart_platform); + int line; + + for (line = 0; (line < nrlines); line++) + m5272_uart_init_line(line, m5272_uart_platform[line].irq); +} + +/***************************************************************************/ + void mcf_disableall(void) { volatile unsigned long *icrp; @@ -93,7 +148,7 @@ int mcf_timerirqpending(int timer) /***************************************************************************/ -void config_BSP(char *commandp, int size) +void __init config_BSP(char *commandp, int size) { #if defined (CONFIG_MOD5272) volatile unsigned char *pivrp; @@ -109,10 +164,6 @@ void config_BSP(char *commandp, int size /* Copy command line from FLASH to local buffer... */ memcpy(commandp, (char *) 0xf0004000, size); commandp[size-1] = 0; -#elif defined(CONFIG_MTD_KeyTechnology) - /* Copy command line from FLASH to local buffer... */ - memcpy(commandp, (char *) 0xffe06000, size); - commandp[size-1] = 0; #elif defined(CONFIG_CANCam) /* Copy command line from FLASH to local buffer... */ memcpy(commandp, (char *) 0xf0010000, size); @@ -125,3 +176,14 @@ void config_BSP(char *commandp, int size } /***************************************************************************/ + +static int __init init_BSP(void) +{ + m5272_uarts_init(); + platform_add_devices(m5272_devices, ARRAY_SIZE(m5272_devices)); + return 0; +} + +arch_initcall(init_BSP); + +/***************************************************************************/ _ Patches currently in -mm which might be from gerg@xxxxxxxxxxxx are origin.patch m68knommu-use-array_size-in-coldfire-serial-driver.patch m68knomu-remove-dead-config-symbols-from-m68knomu-code.patch m68knommu-removing-config-variable-dumptoflash.patch nommu-add-new-vmalloc_user-and-remap_vmalloc_range-interfaces.patch add-cmpxchg_local-to-m68knommu.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html