| Message ID | 1304054499-42526-1-git-send-email-gwenhael.goavec-merou@armadeus.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Apr 29, 2011 at 05:21:39AM +0000, Gwenhael Goavec-Merou wrote: > APF9328 is an i.MXL based SOM (System On Module) that can be plugged on > several docking/development boards. Here only basic module support > is added (Ethernet, Serial, NOR Flash). > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> > Signed-off-by: Eric Jarrige <eric.jarrige@armadeus.org> > Signed-off-by: Nicolas Colombain <nicolas.colombain@armadeus.com> > Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > > Changes since v5: > - suppress array index for struct resource > > Changes since v4: > - use constant instead of multiplications > - change maintainer description > > Changes since v3: > - suppress const and __initconst attributes for platform_data and > resource, > - add SOC_IMX1 in Kconfig > > Changes since v2: > - add const and __initconst attributes for platform_data and resource, > - suppress boot_params. > > Changes since v1: > - merge pins tables for UART > - suppress init/exit driver callbacks for UART > > arch/arm/configs/mx1_defconfig | 1 + > arch/arm/mach-imx/Kconfig | 7 ++ > arch/arm/mach-imx/Makefile | 1 + > arch/arm/mach-imx/mach-apf9328.c | 144 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 153 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/mach-imx/mach-apf9328.c > > diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig > index ff96e8f..e6f6579 100644 > --- a/arch/arm/configs/mx1_defconfig > +++ b/arch/arm/configs/mx1_defconfig > @@ -14,6 +14,7 @@ CONFIG_ARCH_MXC=y > CONFIG_ARCH_MX1=y > CONFIG_ARCH_MX1ADS=y > CONFIG_MACH_SCB9328=y > +CONFIG_MACH_APF9328=y > CONFIG_MXC_IRQ_PRIOR=y > CONFIG_MXC_PWM=y > CONFIG_NO_HZ=y > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig > index 0382301..4f556ee 100644 > --- a/arch/arm/mach-imx/Kconfig > +++ b/arch/arm/mach-imx/Kconfig > @@ -86,6 +86,13 @@ config MACH_SCB9328 > help > Say Y here if you are using a Synertronixx scb9328 board > > +config MACH_APF9328 > + bool "APF9328" > + select SOC_IMX1 > + select IMX_HAVE_PLATFORM_IMX_UART > + help > + Say Yes here if you are using the Armadeus APF9328 development board > + > endif > > if MACH_MX21 > diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile > index 6d51e65..e9eb36d 100644 > --- a/arch/arm/mach-imx/Makefile > +++ b/arch/arm/mach-imx/Makefile > @@ -18,6 +18,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o > # i.MX1 based machines > obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o > obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o > +obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o > > # i.MX21 based machines > obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o > diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c > new file mode 100644 > index 0000000..15e45c8 > --- /dev/null > +++ b/arch/arm/mach-imx/mach-apf9328.c > @@ -0,0 +1,144 @@ > +/* > + * linux/arch/arm/mach-imx/mach-apf9328.c > + * > + * Copyright (c) 2005-2011 ARMadeus systems <support@armadeus.com> > + * > + * This work is based on mach-scb9328.c which is: > + * Copyright (c) 2004 Sascha Hauer <saschahauer@web.de> > + * Copyright (c) 2006-2008 Juergen Beisert <jbeisert@netscape.net> > + * > + * 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 <linux/init.h> > +#include <linux/kernel.h> > +#include <linux/platform_device.h> > +#include <linux/mtd/physmap.h> > +#include <linux/dm9000.h> > + > +#include <asm/mach-types.h> > +#include <asm/mach/arch.h> > +#include <asm/mach/time.h> > + > +#include <mach/common.h> > +#include <mach/hardware.h> > +#include <mach/irqs.h> > +#include <mach/iomux-mx1.h> > + > +#include "devices-imx1.h" > + > +static const int apf9328_pins[] __initconst = { > + /* UART1 */ > + PC9_PF_UART1_CTS, > + PC10_PF_UART1_RTS, > + PC11_PF_UART1_TXD, > + PC12_PF_UART1_RXD, > + /* UART2 */ > + PB28_PF_UART2_CTS, > + PB29_PF_UART2_RTS, > + PB30_PF_UART2_TXD, > + PB31_PF_UART2_RXD, > +}; > + > +/* > + * The APF9328 can have up to 32MB NOR Flash > + */ > +static struct resource flash_resource = { > + .start = MX1_CS0_PHYS, > + .end = MX1_CS0_PHYS + SZ_32M - 1, > + .flags = IORESOURCE_MEM, > +}; > + > +static struct physmap_flash_data apf9328_flash_data = { > + .width = 2, > +}; > + > +static struct platform_device apf9328_flash_device = { > + .name = "physmap-flash", > + .id = 0, > + .dev = { > + .platform_data = &apf9328_flash_data, > + }, > + .resource = &flash_resource, > + .num_resources = 1, > +}; > + > +/* > + * APF9328 has a DM9000 Ethernet controller > + */ > +static struct dm9000_plat_data dm9000_setup = { > + .flags = DM9000_PLATF_16BITONLY > +}; > + > +static struct resource dm9000_resources[] = { > + { > + .start = MX1_CS4_PHYS + 0x00C00000, > + .end = MX1_CS4_PHYS + 0x00C00001, > + .flags = IORESOURCE_MEM, > + }, { > + .start = MX1_CS4_PHYS + 0x00C00002, > + .end = MX1_CS4_PHYS + 0x00C00003, > + .flags = IORESOURCE_MEM, > + }, { > + .start = IRQ_GPIOB(14), > + .end = IRQ_GPIOB(14), > + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, > + }, > +}; > + > +static struct platform_device dm9000x_device = { > + .name = "dm9000", > + .id = 0, > + .num_resources = ARRAY_SIZE(dm9000_resources), > + .resource = dm9000_resources, > + .dev = { > + .platform_data = &dm9000_setup, > + } > +}; > + > +/* --- SERIAL RESSOURCE --- */ > +static const struct imxuart_platform_data uart0_pdata __initconst = { > + .flags = 0, > +}; > + > +static const struct imxuart_platform_data uart1_pdata __initconst = { > + .flags = IMXUART_HAVE_RTSCTS, > +}; > + > +static struct platform_device *devices[] __initdata = { > + &apf9328_flash_device, > + &dm9000x_device, > +}; > + > +static void __init apf9328_init(void) > +{ > + mxc_gpio_setup_multiple_pins(apf9328_pins, > + ARRAY_SIZE(apf9328_pins), > + "APF9328"); > + > + imx1_add_imx_uart0(&uart0_pdata); > + imx1_add_imx_uart1(&uart1_pdata); > + > + platform_add_devices(devices, ARRAY_SIZE(devices)); > +} > + > +static void __init apf9328_timer_init(void) > +{ > + mx1_clocks_init(32768); > +} > + > +static struct sys_timer apf9328_timer = { > + .init = apf9328_timer_init, > +}; > + > +MACHINE_START(APF9328, "Armadeus APF9328") > + /* Maintainer: Gwenhael Goavec-Merou, ARMadeus Systems */ > + .map_io = mx1_map_io, > + .init_early = imx1_init_early, > + .init_irq = mx1_init_irq, > + .timer = &apf9328_timer, > + .init_machine = apf9328_init, > +MACHINE_END > -- > 1.7.3.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig index ff96e8f..e6f6579 100644 --- a/arch/arm/configs/mx1_defconfig +++ b/arch/arm/configs/mx1_defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_MXC=y CONFIG_ARCH_MX1=y CONFIG_ARCH_MX1ADS=y CONFIG_MACH_SCB9328=y +CONFIG_MACH_APF9328=y CONFIG_MXC_IRQ_PRIOR=y CONFIG_MXC_PWM=y CONFIG_NO_HZ=y diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0382301..4f556ee 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -86,6 +86,13 @@ config MACH_SCB9328 help Say Y here if you are using a Synertronixx scb9328 board +config MACH_APF9328 + bool "APF9328" + select SOC_IMX1 + select IMX_HAVE_PLATFORM_IMX_UART + help + Say Yes here if you are using the Armadeus APF9328 development board + endif if MACH_MX21 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 6d51e65..e9eb36d 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o # i.MX1 based machines obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o +obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o # i.MX21 based machines obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c new file mode 100644 index 0000000..15e45c8 --- /dev/null +++ b/arch/arm/mach-imx/mach-apf9328.c @@ -0,0 +1,144 @@ +/* + * linux/arch/arm/mach-imx/mach-apf9328.c + * + * Copyright (c) 2005-2011 ARMadeus systems <support@armadeus.com> + * + * This work is based on mach-scb9328.c which is: + * Copyright (c) 2004 Sascha Hauer <saschahauer@web.de> + * Copyright (c) 2006-2008 Juergen Beisert <jbeisert@netscape.net> + * + * 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 <linux/init.h> +#include <linux/kernel.h> +#include <linux/platform_device.h> +#include <linux/mtd/physmap.h> +#include <linux/dm9000.h> + +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/mach/time.h> + +#include <mach/common.h> +#include <mach/hardware.h> +#include <mach/irqs.h> +#include <mach/iomux-mx1.h> + +#include "devices-imx1.h" + +static const int apf9328_pins[] __initconst = { + /* UART1 */ + PC9_PF_UART1_CTS, + PC10_PF_UART1_RTS, + PC11_PF_UART1_TXD, + PC12_PF_UART1_RXD, + /* UART2 */ + PB28_PF_UART2_CTS, + PB29_PF_UART2_RTS, + PB30_PF_UART2_TXD, + PB31_PF_UART2_RXD, +}; + +/* + * The APF9328 can have up to 32MB NOR Flash + */ +static struct resource flash_resource = { + .start = MX1_CS0_PHYS, + .end = MX1_CS0_PHYS + SZ_32M - 1, + .flags = IORESOURCE_MEM, +}; + +static struct physmap_flash_data apf9328_flash_data = { + .width = 2, +}; + +static struct platform_device apf9328_flash_device = { + .name = "physmap-flash", + .id = 0, + .dev = { + .platform_data = &apf9328_flash_data, + }, + .resource = &flash_resource, + .num_resources = 1, +}; + +/* + * APF9328 has a DM9000 Ethernet controller + */ +static struct dm9000_plat_data dm9000_setup = { + .flags = DM9000_PLATF_16BITONLY +}; + +static struct resource dm9000_resources[] = { + { + .start = MX1_CS4_PHYS + 0x00C00000, + .end = MX1_CS4_PHYS + 0x00C00001, + .flags = IORESOURCE_MEM, + }, { + .start = MX1_CS4_PHYS + 0x00C00002, + .end = MX1_CS4_PHYS + 0x00C00003, + .flags = IORESOURCE_MEM, + }, { + .start = IRQ_GPIOB(14), + .end = IRQ_GPIOB(14), + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, + }, +}; + +static struct platform_device dm9000x_device = { + .name = "dm9000", + .id = 0, + .num_resources = ARRAY_SIZE(dm9000_resources), + .resource = dm9000_resources, + .dev = { + .platform_data = &dm9000_setup, + } +}; + +/* --- SERIAL RESSOURCE --- */ +static const struct imxuart_platform_data uart0_pdata __initconst = { + .flags = 0, +}; + +static const struct imxuart_platform_data uart1_pdata __initconst = { + .flags = IMXUART_HAVE_RTSCTS, +}; + +static struct platform_device *devices[] __initdata = { + &apf9328_flash_device, + &dm9000x_device, +}; + +static void __init apf9328_init(void) +{ + mxc_gpio_setup_multiple_pins(apf9328_pins, + ARRAY_SIZE(apf9328_pins), + "APF9328"); + + imx1_add_imx_uart0(&uart0_pdata); + imx1_add_imx_uart1(&uart1_pdata); + + platform_add_devices(devices, ARRAY_SIZE(devices)); +} + +static void __init apf9328_timer_init(void) +{ + mx1_clocks_init(32768); +} + +static struct sys_timer apf9328_timer = { + .init = apf9328_timer_init, +}; + +MACHINE_START(APF9328, "Armadeus APF9328") + /* Maintainer: Gwenhael Goavec-Merou, ARMadeus Systems */ + .map_io = mx1_map_io, + .init_early = imx1_init_early, + .init_irq = mx1_init_irq, + .timer = &apf9328_timer, + .init_machine = apf9328_init, +MACHINE_END