From: Tony Lindgren <tony@atomide.com>
To: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.arm.linux.org.uk,
linux-omap@vger.kernel.org
Subject: Re: [PATCH 5/9] OMAP1: AMS_DELTA: add modem support
Date: Mon, 24 Aug 2009 15:51:55 +0300 [thread overview]
Message-ID: <20090824125155.GJ7069@atomide.com> (raw)
In-Reply-To: <4A8AAA48.8020702@tis.icnet.pl>
* Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [090818 16:20]:
> Tony Lindgren wrote:
>> From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
>>
>> This patch adds support for modem device found on Amstrad E3 (Delta) board.
>>
>> 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.
>>
>> This patch is dependent on 8250 driver changes getting accepted upstream:
>> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=7053133124d5cdf207c1168c7a0c582a18e12ea7
>>
>> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>> ---
>> arch/arm/mach-omap1/board-ams-delta.c | 38 +++++++++++++++++++++++++++++++++
>> 1 files changed, 38 insertions(+), 0 deletions(-)
>>
> Russel,
>
> Unlike all others from the series, this one got no single comment from
> you, niether your "OK" nor anything else. I'm not sure what that could
> mean, but if there is still something I can do to help getting it into
> 2.6.32, please let me know.
I've queued this series into omap for-next branch along with other omap
code going upstream.
Regards,
Tony
>
> Thanks,
> Janusz
>
>> diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
>> index db4d9a4..40dfa63 100644
>> --- a/arch/arm/mach-omap1/board-ams-delta.c
>> +++ b/arch/arm/mach-omap1/board-ams-delta.c
>> @@ -15,8 +15,11 @@
>> #include <linux/kernel.h>
>> #include <linux/init.h>
>> #include <linux/input.h>
>> +#include <linux/interrupt.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>
>> @@ -234,6 +237,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,
>> + .irqflags = IRQF_TRIGGER_RISING,
>> + .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);
>> +
>> + 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 majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>
next prev parent reply other threads:[~2009-08-24 12:52 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-11 9:45 [PATCH 0/9] Omap updates for upcoming 2.6.32 merge window Tony Lindgren
2009-08-11 9:46 ` [PATCH 1/9] OMAP: remove OMAP_TAG_SERIAL_CONSOLE Tony Lindgren
2009-08-13 9:15 ` Russell King - ARM Linux
2009-08-11 9:47 ` [PATCH 2/9] OMAP: remove OMAP_TAG_UART Tony Lindgren
2009-08-13 9:16 ` Russell King - ARM Linux
2009-08-24 12:54 ` [PATCH 2/9] OMAP: remove OMAP_TAG_UART, v2 Tony Lindgren
2009-08-11 9:49 ` [PATCH 3/9] OMAP: Remove omap boot parsing code Tony Lindgren
2009-08-13 9:16 ` Russell King - ARM Linux
2009-08-11 9:50 ` [PATCH 4/9] OMAP: GPIO: Avoid generating extra IRQs Tony Lindgren
2009-08-13 9:17 ` Russell King - ARM Linux
2009-08-11 9:51 ` [PATCH 5/9] OMAP1: AMS_DELTA: add modem support Tony Lindgren
2009-08-18 13:19 ` Janusz Krzysztofik
2009-08-24 12:51 ` Tony Lindgren [this message]
2009-08-11 9:53 ` [PATCH 6/9] OMAP2/3: Add support for flash on SDP boards Tony Lindgren
2009-08-11 14:33 ` vimal singh
2009-08-12 11:30 ` Tony Lindgren
2009-08-12 11:41 ` vimal singh
2009-08-12 11:44 ` Tony Lindgren
2009-08-11 9:54 ` [PATCH 7/9] OMAP2: compile usb-tusb6010.c Tony Lindgren
2009-08-13 9:18 ` Russell King - ARM Linux
2009-08-11 9:55 ` [PATCH 8/9] OMAP2: add board file for Nokia N800 and N810 Tony Lindgren
2009-08-13 9:15 ` Russell King - ARM Linux
2009-08-14 6:01 ` Kalle Valo
2009-08-14 11:08 ` Tony Lindgren
2009-08-15 6:28 ` Kalle Valo
2009-08-15 7:38 ` Kalle Valo
2009-08-15 7:44 ` [PATCH v2] " Kalle Valo
2009-08-16 15:03 ` Tony Lindgren
2009-08-24 12:57 ` [PATCH v2] OMAP2: add board file for Nokia N800 and N810, v3 Tony Lindgren
2009-08-11 9:57 ` [PATCH 9/9] OMAP2: n8x0: add n8x0_defconfig Tony Lindgren
2009-08-13 9:18 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090824125155.GJ7069@atomide.com \
--to=tony@atomide.com \
--cc=jkrzyszt@tis.icnet.pl \
--cc=linux-arm-kernel@lists.arm.linux.org.uk \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox