2009-07-05 14:04:32

by Janusz Krzysztofik

Subject: [PATCH v2] OMAP1: AMS_DELTA: add modem support

This patch adds support for modem device found on Amstrad E3 (Delta) board.

Created against linux-2.6.31-rc1.

Based on earlier patch by Jonathan McDowell, available at
http://the.earth.li/pub/e3/2.6.19/ams-delta-modem.patch.
Modified after Ladislav Michl's arch/arm/mach-omap1/board-voiceblue.c.

Signed-off-by: Janusz Krzysztofik <[email protected]>
---
Registering the modem platform device from a separate arch_initcall (and not
from init_machine() callback) preserves serial console port at ttyS0.

OMAP mux pin set up just for case if Amstrad bootloader is ever replaced.

--- linux-2.6.31-rc1/arch/arm/mach-omap1/board-ams-delta.c.orig 2009-07-04 16:39:37.000000000 +0200
+++ linux-2.6.31-rc1/arch/arm/mach-omap1/board-ams-delta.c 2009-07-05 13:41:08.000000000 +0200
@@ -15,8 +15,11 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/input.h>
+#include <linux/irq.h>
#include <linux/platform_device.h>
+#include <linux/serial_8250.h>

+#include <asm/serial.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -235,6 +238,41 @@ static void __init ams_delta_init(void)
platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
}

+static struct plat_serial8250_port ams_delta_modem_ports[] = {
+ {
+ .membase = (void *) AMS_DELTA_MODEM_VIRT,
+ .mapbase = AMS_DELTA_MODEM_PHYS,
+ .irq = -EINVAL, /* changed later */
+ .flags = UPF_BOOT_AUTOCONF,
+ .iotype = UPIO_MEM,
+ .regshift = 1,
+ .uartclk = BASE_BAUD * 16,
+ },
+ { },
+};
+
+static struct platform_device ams_delta_modem_device = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM1,
+ .dev = {
+ .platform_data = ams_delta_modem_ports,
+ },
+};
+
+static int __init ams_delta_modem_init(void)
+{
+ omap_cfg_reg(M14_1510_GPIO2);
+ ams_delta_modem_ports[0].irq = gpio_to_irq(2);
+ set_irq_type(gpio_to_irq(2), IRQ_TYPE_EDGE_RISING);
+
+ ams_delta_latch2_write(
+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,
+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC);
+
+ return platform_device_register(&ams_delta_modem_device);
+}
+arch_initcall(ams_delta_modem_init);
+
static void __init ams_delta_map_io(void)
{
omap1_map_common_io();

2009-07-06 04:50:43

by Pandita, Vikram

Subject: RE: [PATCH v2] OMAP1: AMS_DELTA: add modem support

Janusz/Alan

>-----Original Message-----
>From: [email protected] [mailto:[email protected]] On Behalf Of Janusz
>Krzysztofik
>
+static int __init ams_delta_modem_init(void)
>+{
>+ omap_cfg_reg(M14_1510_GPIO2);
>+ ams_delta_modem_ports[0].irq = gpio_to_irq(2);
>+ set_irq_type(gpio_to_irq(2), IRQ_TYPE_EDGE_RISING);

There is a recent change on specifying irqflags as example:
http://patchwork.kernel.org/patch/31888/

There is a dependency for Alan Cox to push this patch first though:
http://patchwork.kernel.org/patch/31884/

Reference:
http://lkml.indiana.edu/hypermail/linux/kernel/0906.2/02827.html


>+
>+ ams_delta_latch2_write(
>+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,
>+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC);
>+
>+ return platform_device_register(&ams_delta_modem_device);
>+}
>+arch_initcall(ams_delta_modem_init);
>+
> static void __init ams_delta_map_io(void)
> {
> omap1_map_common_io();
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-omap" in
>the body of a message to [email protected]
>More majordomo info at http://vger.kernel.org/majordomo-info.html

2009-07-06 09:00:20

by Janusz Krzysztofik

Subject: Re: [PATCH v2] OMAP1: AMS_DELTA: add modem support

Monday 06 July 2009 06:49:34 Pandita, Vikram napisał(a):
> Janusz/Alan
>
> >-----Original Message-----
> >From: [email protected]
> > [mailto:[email protected]] On Behalf Of Janusz Krzysztofik
>
> +static int __init ams_delta_modem_init(void)
>
> >+{
> >+ omap_cfg_reg(M14_1510_GPIO2);
> >+ ams_delta_modem_ports[0].irq = gpio_to_irq(2);
> >+ set_irq_type(gpio_to_irq(2), IRQ_TYPE_EDGE_RISING);
>
> There is a recent change on specifying irqflags as example:
> http://patchwork.kernel.org/patch/31888/
>
> There is a dependency for Alan Cox to push this patch first though:
> http://patchwork.kernel.org/patch/31884/
>
> Reference:
> http://lkml.indiana.edu/hypermail/linux/kernel/0906.2/02827.html

I can change and resubmit as v3, then Tony will choose which one applies, OK?

Janusz