Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934108AbYBAHgf (ORCPT ); Fri, 1 Feb 2008 02:36:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933518AbYBAHfx (ORCPT ); Fri, 1 Feb 2008 02:35:53 -0500 Received: from rex.snapgear.com ([203.143.235.140]:47369 "EHLO snapgear.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933493AbYBAHfv (ORCPT ); Fri, 1 Feb 2008 02:35:51 -0500 Date: Fri, 1 Feb 2008 17:34:32 +1000 From: Greg Ungerer Message-Id: <200802010734.m117YWOS022601@goober> To: torvalds@linux-foundation.org Subject: [M68KNOMMU]: platform setup for 5272 ColdFire parts Cc: gerg@uclinux.org, linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3408 Lines: 117 Switch to platform style configuration for 5272 ColdFire parts. Initial support is for the UARTs. DMA support moved to common code for all ColdFire parts. Signed-off-by: Greg Ungerer --- diff -Naurp linux-2.6.24/arch/m68knommu/platform/5272/config.c linux-2.6.24-uc0/arch/m68knommu/platform/5272/config.c --- linux-2.6.24/arch/m68knommu/platform/5272/config.c 2008-01-25 08:58:37.000000000 +1000 +++ linux-2.6.24-uc0/arch/m68knommu/platform/5272/config.c 2008-01-11 13:37:38.000000000 +1000 #include #include #include -#include +#include #include #include #include -#include +#include /***************************************************************************/ @@ -37,14 +37,57 @@ unsigned char ledbank = 0xff; /***************************************************************************/ -/* - * DMA channel base address table. - */ -unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = { - MCF_MBAR + MCFDMA_BASE0, +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, }; -unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS]; +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); +} /***************************************************************************/ @@ -93,7 +136,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; @@ -125,3 +168,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); + +/***************************************************************************/ -- 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/