: platform setup for 520x ColdFire parts
Switch to platform style configuration for 520x ColdFire parts. Initial support is for the UARTs. DMA support moved to common code for all ColdFire parts.
---
arch/m68knommu/platform/520x/config.c +92 -9
@@ -5,7 +5,7 @@* * Copyright (C) 2005, Freescale (www.freescale.com) * Copyright (C) 2005, Intec Automation ([email protected]) -* Copyright (C) 1999-2003, Greg Ungerer ([email protected]) +* Copyright (C) 1999-2007, Greg Ungerer ([email protected]) * Copyright (C) 2001-2003, SnapGear Inc. (www.snapgear.com) */
@@ -13,21 +13,93 @@#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/dma.h> +#include <asm/coldfire.h> +#include <asm/mcfsim.h> +#include <asm/mcfuart.h> /***************************************************************************/ -/* -* DMA channel base address table. -*/ -unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS ]; -unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS ]; +void coldfire_reset (void );/***************************************************************************/ -void coldfire_reset (void ); +static struct mcf_platform_uart m520x_uart_platform[] = { + { + .mapbase =MCF_MBAR +MCFUART_BASE1 , + .irq =MCFINT_VECBASE +MCFINT_UART0 , + }, + { + .mapbase =MCF_MBAR +MCFUART_BASE2 , + .irq =MCFINT_VECBASE +MCFINT_UART1 , + }, + { + .mapbase =MCF_MBAR +MCFUART_BASE3 , + .irq =MCFINT_VECBASE +MCFINT_UART2 , + }, + { }, +}; + +static struct platform_device m520x_uart = { + .name ="mcfuart" , + .id =0 , + .dev.platform_data = m520x_uart_platform, +}; + +static struct platform_device *m520x_devices[]__initdata = { + &m520x_uart, +}; + +/***************************************************************************/ + +#define INTC0 (MCF_MBAR + MCFICM_INTC0) + +static void __init m520x_uart_init_line (int line,int irq) +{ +u32 imr; +u16 par; +u8 par2; + +writeb (0x03 ,INTC0 +MCFINTC_ICR0 +MCFINT_UART0 + line); + + imr =readl (INTC0 +MCFINTC_IMRL ); + imr &= ~((1 << (irq -MCFINT_VECBASE )) |1 ); +writel (imr,INTC0 +MCFINTC_IMRL ); + +switch (line) { +case 0 : + par =readw (MCF_IPSBAR +MCF_GPIO_PAR_UART ); + par |=MCF_GPIO_PAR_UART_PAR_UTXD0 | +MCF_GPIO_PAR_UART_PAR_URXD0 ; +writew (par,MCF_IPSBAR +MCF_GPIO_PAR_UART ); +break ; +case 1 : + par =readw (MCF_IPSBAR +MCF_GPIO_PAR_UART ); + par |=MCF_GPIO_PAR_UART_PAR_UTXD1 | +MCF_GPIO_PAR_UART_PAR_URXD1 ; +writew (par,MCF_IPSBAR +MCF_GPIO_PAR_UART ); +break ; +case 2 : + par2 =readb (MCF_IPSBAR +MCF_GPIO_PAR_FECI2C ); + par2 &= ~0x0F ; + par2 |=MCF_GPIO_PAR_FECI2C_PAR_SCL_UTXD2 | +MCF_GPIO_PAR_FECI2C_PAR_SDA_URXD2 ; +writeb (par2,MCF_IPSBAR +MCF_GPIO_PAR_FECI2C ); +break ; + } +} + +static void __init m520x_uarts_init (void ) +{ +const int nrlines =ARRAY_SIZE (m520x_uart_platform); +int line; + +for (line =0 ; (line < nrlines); line++) +m520x_uart_init_line (line, m520x_uart_platform[line].irq); +}/***************************************************************************/
@@ -42,9 +114,20 @@ void mcf_autovector(unsigned int vec)/***************************************************************************/ -void config_BSP (char *commandp,int size) +void __init config_BSP (char *commandp,int size) { mach_reset = coldfire_reset; +m520x_uarts_init (); +} + +/***************************************************************************/ + +static int __init init_BSP (void ) +{ +platform_add_devices (m520x_devices,ARRAY_SIZE (m520x_devices)); +return 0 ; } +arch_initcall (init_BSP); +/***************************************************************************/
Quoted 9 lines · Greg Ungerer
Switch to platform style configuration for 520x ColdFire parts. Initial support is for the UARTs. DMA support moved to common code for all ColdFire parts.
arch/m68knommu/platform/520x/config.c +5
-0+static struct mcf_platform_uart m520x_uart_platform[] = { + { + .mapbase =MCF_MBAR +MCFUART_BASE1 , + .irq =MCFINT_VECBASE +MCFINT_UART0 , + },
arch/m68knommu/platform/520x/config.c line 44
Quoted 10 lines
arch/m68knommu/platform/520x/config.c +10
-0+ { + .mapbase = MCF_MBAR + MCFUART_BASE2, + .irq = MCFINT_VECBASE + MCFINT_UART1, + }, + { + .mapbase = MCF_MBAR + MCFUART_BASE3, + .irq = MCFINT_VECBASE + MCFINT_UART2, + }, + { }, +};
const?
Same comments for the rest of the patch and the other similar patches.
Note: Use __initdataconst for const data as replacement for __initdata.
Sam
Hi Sam,
Quoted 23 lines · Sam Ravnborg
Quoted 9 lines · Greg Ungerer
Switch to platform style configuration for 520x ColdFire parts. Initial support is for the UARTs. DMA support moved to common code for all ColdFire parts.
arch/m68knommu/platform/520x/config.c +5
-0+static struct mcf_platform_uart m520x_uart_platform[] = { + { + .mapbase =MCF_MBAR +MCFUART_BASE1 , + .irq =MCFINT_VECBASE +MCFINT_UART0 , + },arch/m68knommu/platform/520x/config.c line 44
Quoted 10 lines
arch/m68knommu/platform/520x/config.c +10
-0+ { + .mapbase = MCF_MBAR + MCFUART_BASE2, + .irq = MCFINT_VECBASE + MCFINT_UART1, + }, + { + .mapbase = MCF_MBAR + MCFUART_BASE3, + .irq = MCFINT_VECBASE + MCFINT_UART2, + }, + { }, +};const?
Same comments for the rest of the patch and the other similar patches.
Quoted 1 line
Note: Use
__initdataconstfor const data as replacement for__initdata.
I am confused, __initdataconst?
Regards
Greg
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [email protected] SnapGear -- a Secure Computing Company PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
Quoted 27 lines · Greg Ungerer
Hi Sam,
Quoted 23 lines · Sam Ravnborg
Quoted 9 lines · Greg Ungerer
Switch to platform style configuration for 520x ColdFire parts. Initial support is for the UARTs. DMA support moved to common code for all ColdFire parts.
arch/m68knommu/platform/520x/config.c +5
-0+static struct mcf_platform_uart m520x_uart_platform[] = { + { + .mapbase =MCF_MBAR +MCFUART_BASE1 , + .irq =MCFINT_VECBASE +MCFINT_UART0 , + },arch/m68knommu/platform/520x/config.c line 44
Quoted 10 lines
arch/m68knommu/platform/520x/config.c +10
-0+ { + .mapbase = MCF_MBAR + MCFUART_BASE2, + .irq = MCFINT_VECBASE + MCFINT_UART1, + }, + { + .mapbase = MCF_MBAR + MCFUART_BASE3, + .irq = MCFINT_VECBASE + MCFINT_UART2, + }, + { }, +};const?
Same comments for the rest of the patch and the other similar patches.
Quoted 3 lines
Quoted 1 line
Note: Use
__initdataconstfor const data as replacement for__initdata.I am confused,
__initdataconst?
Newly introduced...
We only had __*initdata before and therefore we could not annotate both non-const and const data in a mix - gcc would barf out.
So we added a new member of the set of annotations:__initconst used to annotate const data.
[I see - I had a spelling error above - I guess that why I confused you]
Sam