* [PATCH v2] [ARM] MX1: Add ARMadeus Systems APF9328 board support
@ 2011-03-08 17:36 Gwenhael Goavec-Merou
2011-04-04 15:17 ` Uwe Kleine-König
0 siblings, 1 reply; 2+ messages in thread
From: Gwenhael Goavec-Merou @ 2011-03-08 17:36 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
Changes since v1:
- merge pins tables for UART
- suppress init/exit driver callbacks for UART
arch/arm/mach-imx/Kconfig | 6 ++
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/mach-apf9328.c | 146 ++++++++++++++++++++++++++++++++++++++
3 files changed, 153 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-imx/mach-apf9328.c
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 56684b5..863ed2c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -51,6 +51,12 @@ config MACH_SCB9328
help
Say Y here if you are using a Synertronixx scb9328 board
+config MACH_APF9328
+ bool "APF9328"
+ select IMX_HAVE_PLATFORM_IMX_UART
+ help
+ Say Yes here if you are using the Armadeus APF9328 development board
+
endif
if ARCH_MX2
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 77100bf..444fdf7 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
+obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
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..49abc73
--- /dev/null
+++ b/arch/arm/mach-imx/mach-apf9328.c
@@ -0,0 +1,146 @@
+/*
+ * 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 + (32 * 1024 * 1024) - 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[] = {
+ [0] = {
+ .start = (MX1_CS4_PHYS + 0x00C00000),
+ .end = (MX1_CS4_PHYS + 0x00C00001),
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = (MX1_CS4_PHYS + 0x00C00002),
+ .end = (MX1_CS4_PHYS + 0x00C00003),
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .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 struct imxuart_platform_data uart0_pdata = {
+ .flags = 0,
+};
+
+static struct imxuart_platform_data uart1_pdata = {
+ .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.com> */
+ .boot_params = MX1_PHYS_OFFSET + 0x100,
+ .map_io = mx1_map_io,
+ .init_irq = mx1_init_irq,
+ .timer = &apf9328_timer,
+ .init_machine = apf9328_init,
+MACHINE_END
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] [ARM] MX1: Add ARMadeus Systems APF9328 board support
2011-03-08 17:36 [PATCH v2] [ARM] MX1: Add ARMadeus Systems APF9328 board support Gwenhael Goavec-Merou
@ 2011-04-04 15:17 ` Uwe Kleine-König
0 siblings, 0 replies; 2+ messages in thread
From: Uwe Kleine-König @ 2011-04-04 15:17 UTC (permalink / raw)
To: linux-arm-kernel
Hello Gwenhael,
On Tue, Mar 08, 2011 at 05:36:49PM +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>
> ---
>
> Changes since v1:
> - merge pins tables for UART
> - suppress init/exit driver callbacks for UART
>
> arch/arm/mach-imx/Kconfig | 6 ++
> arch/arm/mach-imx/Makefile | 1 +
> arch/arm/mach-imx/mach-apf9328.c | 146 ++++++++++++++++++++++++++++++++++++++
> 3 files changed, 153 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-imx/mach-apf9328.c
>
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 56684b5..863ed2c 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -51,6 +51,12 @@ config MACH_SCB9328
> help
> Say Y here if you are using a Synertronixx scb9328 board
>
> +config MACH_APF9328
> + bool "APF9328"
> + select IMX_HAVE_PLATFORM_IMX_UART
> + help
> + Say Yes here if you are using the Armadeus APF9328 development board
> +
> endif
>
> if ARCH_MX2
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index 77100bf..444fdf7 100644
Maybe add MACH_APF9328=y to mx1_defconfig?
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -19,6 +19,7 @@ obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
>
> obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
> obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
> +obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
>
> 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..49abc73
> --- /dev/null
> +++ b/arch/arm/mach-imx/mach-apf9328.c
> @@ -0,0 +1,146 @@
> +/*
> + * 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 + (32 * 1024 * 1024) - 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,
> +};
If you use imx_add_platform_device to register the device
apf9328_flash_data and flash_resource can be moved to .init.rodata. For
some extra points introduce imx_add_physmap_flash.
> +
> +/*
> + * APF9328 has a DM9000 Ethernet controller
> + */
> +static struct dm9000_plat_data dm9000_setup = {
> + .flags = DM9000_PLATF_16BITONLY
> +};
> +
> +static struct resource dm9000_resources[] = {
> + [0] = {
> + .start = (MX1_CS4_PHYS + 0x00C00000),
> + .end = (MX1_CS4_PHYS + 0x00C00001),
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = {
> + .start = (MX1_CS4_PHYS + 0x00C00002),
> + .end = (MX1_CS4_PHYS + 0x00C00003),
> + .flags = IORESOURCE_MEM,
> + },
> + [2] = {
> + .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,
> + }
> +};
ditto, extra points for imx_add_dm9000
> +
> +/* --- SERIAL RESSOURCE --- */
> +static struct imxuart_platform_data uart0_pdata = {
these should be const and __initconst
> + .flags = 0,
> +};
> +
> +static struct imxuart_platform_data uart1_pdata = {
> + .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.com> */
> + .boot_params = MX1_PHYS_OFFSET + 0x100,
This shouldn't be needed with a modern boot loader.
> + .map_io = mx1_map_io,
+ .init_early = imx1_init_early,
> + .init_irq = mx1_init_irq,
> + .timer = &apf9328_timer,
> + .init_machine = apf9328_init,
> +MACHINE_END
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-04 15:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-08 17:36 [PATCH v2] [ARM] MX1: Add ARMadeus Systems APF9328 board support Gwenhael Goavec-Merou
2011-04-04 15:17 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).