[PATCH] ARM: mxs: Change duart device to use amba-pl011

[Wolfram Sang]

Hi Shawn,

On Tue, Dec 21, 2010 at 09:12:10PM +0800, Shawn Guo wrote:
> The mxs duart is actually an amba-pl011 device. This commit changes
> the duart device code to dynamically allocate amba-pl011 device,
> so that drivers/serial/amba-pl011.c can be used on mxs.
> 
> Signed-off-by: Shawn Guo <shawn.guo at freescale.com>

Great that it works!

> ---
> This is a follow-up patch again the patch series below, which is
> waiting for the merge.
> 
>  [PATCH v8 00/15] ARM: mxs: Add initial support for MX23 and MX28
> 
>  arch/arm/mach-mxs/Kconfig                       |    6 ++-
>  arch/arm/mach-mxs/clock-mx23.c                  |    2 +-
>  arch/arm/mach-mxs/clock-mx28.c                  |    2 +-
>  arch/arm/mach-mxs/devices-mx23.h                |    4 +-
>  arch/arm/mach-mxs/devices-mx28.h                |    4 +-
>  arch/arm/mach-mxs/devices/Kconfig               |    2 +-
>  arch/arm/mach-mxs/devices/Makefile              |    2 +-
>  arch/arm/mach-mxs/devices/amba-duart.c          |   39 ++++++++++++++++++
>  arch/arm/mach-mxs/devices/platform-duart.c      |   48 -----------------------
>  arch/arm/mach-mxs/include/mach/devices-common.h |    9 +---
>  10 files changed, 53 insertions(+), 65 deletions(-)
>  create mode 100644 arch/arm/mach-mxs/devices/amba-duart.c
>  delete mode 100644 arch/arm/mach-mxs/devices/platform-duart.c
> 
> diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
> index c4ac7b4..0d072e9 100644
> --- a/arch/arm/mach-mxs/Kconfig
> +++ b/arch/arm/mach-mxs/Kconfig
> @@ -5,17 +5,19 @@ source "arch/arm/mach-mxs/devices/Kconfig"
>  config SOC_IMX23
>  	bool
>  	select CPU_ARM926T
> +	select ARM_AMBA
>  
>  config SOC_IMX28
>  	bool
>  	select CPU_ARM926T
> +	select ARM_AMBA
>  
>  comment "MXS platforms:"
>  
>  config MACH_MX23EVK
>  	bool "Support MX23EVK Platform"
>  	select SOC_IMX23
> -	select MXS_HAVE_PLATFORM_DUART
> +	select MXS_HAVE_AMBA_DUART
>  	default y
>  	help
>  	  Include support for MX23EVK platform. This includes specific
> @@ -24,7 +26,7 @@ config MACH_MX23EVK
>  config MACH_MX28EVK
>  	bool "Support MX28EVK Platform"
>  	select SOC_IMX28
> -	select MXS_HAVE_PLATFORM_DUART
> +	select MXS_HAVE_AMBA_DUART
>  	select MXS_HAVE_PLATFORM_FEC
>  	default y
>  	help
> diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c
> index 8f5a19a..0f65d15 100644
> --- a/arch/arm/mach-mxs/clock-mx23.c
> +++ b/arch/arm/mach-mxs/clock-mx23.c
> @@ -437,7 +437,7 @@ _DEFINE_CLOCK(clk32k_clk, XTAL, TIMROT_CLK32K_GATE, &ref_xtal_clk);
>  	},
>  
>  static struct clk_lookup lookups[] = {
> -	_REGISTER_CLOCK("mxs-duart.0", NULL, uart_clk)
> +	_REGISTER_CLOCK("uart", NULL, uart_clk)

Maybe "duart"?

>  	_REGISTER_CLOCK("rtc", NULL, rtc_clk)
>  	_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
>  	_REGISTER_CLOCK(NULL, "xclk", xbus_clk)
> diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
> index 74e2103..dd6d158 100644
> --- a/arch/arm/mach-mxs/clock-mx28.c
> +++ b/arch/arm/mach-mxs/clock-mx28.c
> @@ -602,7 +602,7 @@ _DEFINE_CLOCK(fec_clk, ENET, DISABLE, &hbus_clk);
>  	},
>  
>  static struct clk_lookup lookups[] = {
> -	_REGISTER_CLOCK("mxs-duart.0", NULL, uart_clk)
> +	_REGISTER_CLOCK("uart", NULL, uart_clk)

Maybe "duart"?

>  	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
>  	_REGISTER_CLOCK("rtc", NULL, rtc_clk)
>  	_REGISTER_CLOCK("pll2", NULL, pll2_clk)
> diff --git a/arch/arm/mach-mxs/devices-mx23.h b/arch/arm/mach-mxs/devices-mx23.h
> index d0f49fc..36397ff 100644
> --- a/arch/arm/mach-mxs/devices-mx23.h
> +++ b/arch/arm/mach-mxs/devices-mx23.h
> @@ -11,6 +11,6 @@
>  #include <mach/mx23.h>
>  #include <mach/devices-common.h>
>  
> -extern const struct mxs_duart_data mx23_duart_data __initconst;
> +extern struct amba_device mx23_duart_device;
>  #define mx23_add_duart() \
> -	mxs_add_duart(&mx23_duart_data)
> +	mxs_add_duart(&mx23_duart_device)
> diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
> index 00b736c..e84a7fe 100644
> --- a/arch/arm/mach-mxs/devices-mx28.h
> +++ b/arch/arm/mach-mxs/devices-mx28.h
> @@ -11,9 +11,9 @@
>  #include <mach/mx28.h>
>  #include <mach/devices-common.h>
>  
> -extern const struct mxs_duart_data mx28_duart_data __initconst;
> +extern struct amba_device mx28_duart_device;
>  #define mx28_add_duart() \
> -	mxs_add_duart(&mx28_duart_data)
> +	mxs_add_duart(&mx28_duart_device)
>  
>  extern const struct mxs_fec_data mx28_fec_data[] __initconst;
>  #define mx28_add_fec(id, pdata) \
> diff --git a/arch/arm/mach-mxs/devices/Kconfig b/arch/arm/mach-mxs/devices/Kconfig
> index a35a2dc..3dff25c 100644
> --- a/arch/arm/mach-mxs/devices/Kconfig
> +++ b/arch/arm/mach-mxs/devices/Kconfig
> @@ -1,4 +1,4 @@
> -config MXS_HAVE_PLATFORM_DUART
> +config MXS_HAVE_AMBA_DUART
>  	bool
>  
>  config MXS_HAVE_PLATFORM_FEC
> diff --git a/arch/arm/mach-mxs/devices/Makefile b/arch/arm/mach-mxs/devices/Makefile
> index 4b5266a..d0a09f6 100644
> --- a/arch/arm/mach-mxs/devices/Makefile
> +++ b/arch/arm/mach-mxs/devices/Makefile
> @@ -1,2 +1,2 @@
> -obj-$(CONFIG_MXS_HAVE_PLATFORM_DUART) += platform-duart.o
> +obj-$(CONFIG_MXS_HAVE_AMBA_DUART) += amba-duart.o
>  obj-$(CONFIG_MXS_HAVE_PLATFORM_FEC) += platform-fec.o
> diff --git a/arch/arm/mach-mxs/devices/amba-duart.c b/arch/arm/mach-mxs/devices/amba-duart.c
> new file mode 100644
> index 0000000..d805e22
> --- /dev/null
> +++ b/arch/arm/mach-mxs/devices/amba-duart.c
> @@ -0,0 +1,39 @@
> +/*
> + * Copyright (C) 2009-2010 Pengutronix
> + * Uwe Kleine-Koenig <u.kleine-koenig at pengutronix.de>
> + *
> + * Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify it under
> + * the terms of the GNU General Public License version 2 as published by the
> + * Free Software Foundation.
> + */
> +#include <mach/mx23.h>
> +#include <mach/mx28.h>
> +#include <mach/devices-common.h>
> +
> +#define MXS_AMBA_DEVICE(name, soc)				\

Maybe MXS_AMBA_DUART_DEVICE? It now sounds more generic than it actually is ;)

> +struct amba_device name##_device = {				\
> +	.dev = {						\
> +		.init_name = "uart",				\

"duart" again?

> +	},							\
> +	.res = {						\
> +		.start = soc ## _DUART_BASE_ADDR,		\
> +		.end = (soc ## _DUART_BASE_ADDR) + SZ_8K - 1,	\
> +		.flags = IORESOURCE_MEM,			\
> +	},							\
> +	.irq = {soc ## _INT_DUART, NO_IRQ},			\
> +}

[...]

Kind regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20101221/349e7817/attachment.sig>