Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754992AbXJ3Eos (ORCPT ); Tue, 30 Oct 2007 00:44:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754750AbXJ3Emy (ORCPT ); Tue, 30 Oct 2007 00:42:54 -0400 Received: from rex.snapgear.com ([203.143.235.140]:37134 "EHLO snapgear.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752902AbXJ3Emw (ORCPT ); Tue, 30 Oct 2007 00:42:52 -0400 Date: Tue, 30 Oct 2007 14:41:51 +1000 From: Greg Ungerer Message-Id: <200710300441.l9U4fpcl032230@goober> To: torvalds@linux-foundation.org Subject: [M68KNOMMU]: platform setup for 5206 ColdFire UARTs Cc: gerg@uclinux.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3212 Lines: 107 Switch to platform style configuration for 5206 ColdFire UARTs. Signed-off-by: Greg Ungerer --- diff -Naurp linux-2.6.23-rc1/arch/m68knommu/platform/5206/config.c linux-2.6.23-rc1.platform/arch/m68knommu/platform/5206/config.c --- linux-2.6.23-rc1/arch/m68knommu/platform/5206/config.c 2007-10-25 10:48:36.000000000 +1000 +++ linux-2.6.23-rc1.platform/arch/m68knommu/platform/5206/config.c 2007-10-30 14:18:24.000000000 +1000 @@ -13,12 +13,12 @@ #include #include #include -#include #include +#include +#include #include -#include #include -#include +#include /***************************************************************************/ @@ -38,6 +38,54 @@ unsigned int dma_device_address[MAX_M68K /***************************************************************************/ +static struct mcf_platform_uart m5206_uart_platform[] = { + { + .mapbase = MCF_MBAR + MCFUART_BASE1, + .irq = 73, + }, + { + .mapbase = MCF_MBAR + MCFUART_BASE2, + .irq = 74, + }, + { }, +}; + +static struct platform_device m5206_uart = { + .name = "mcfuart", + .id = 0, + .dev.platform_data = m5206_uart_platform, +}; + +static struct platform_device *m5206_devices[] __initdata = { + &m5206_uart, +}; + +/***************************************************************************/ + +static void __init m5206_uart_init_line(int line, int irq) +{ + if (line == 0) { + writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR); + writeb(irq, MCFUART_BASE1 + MCFUART_UIVR); + mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1); + } else if (line == 1) { + writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR); + writeb(irq, MCFUART_BASE2 + MCFUART_UIVR); + mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2); + } +} + +static void __init m5206_uarts_init(void) +{ + const int nrlines = ARRAY_SIZE(m5206_uart_platform); + int line; + + for (line = 0; (line < nrlines); line++) + m5206_uart_init_line(line, m5206_uart_platform[line].irq); +} + +/***************************************************************************/ + void mcf_autovector(unsigned int vec) { volatile unsigned char *mbar; @@ -88,10 +136,21 @@ int mcf_timerirqpending(int timer) /***************************************************************************/ -void config_BSP(char *commandp, int size) +void __init config_BSP(char *commandp, int size) { mcf_setimr(MCFSIM_IMR_MASKALL); mach_reset = coldfire_reset; } /***************************************************************************/ + +static int __init init_BSP(void) +{ + m5206_uarts_init(); + platform_add_devices(m5206_devices, ARRAY_SIZE(m5206_devices)); + return 0; +} + +arch_initcall(init_BSP); + +/***************************************************************************/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/