* [PATCH 2/4] PalmZ71 - OMAP310 Serial
@ 2006-10-24 15:21 Marek Vašut
2006-10-25 23:55 ` Marek Vašut
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vašut @ 2006-10-24 15:21 UTC (permalink / raw)
To: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 83 bytes --]
Hi,
this makes serial usable also on omap310, not only 1510.
(changing 1510->15xx)
[-- Attachment #2: omap-serial-fix.patch --]
[-- Type: text/x-diff, Size: 2296 bytes --]
diff -Naur linux-omap/arch/arm/mach-omap1/serial.c linux-omap-z71/arch/arm/mach-omap1/serial.c
--- linux-omap/arch/arm/mach-omap1/serial.c 2006-10-15 16:09:10.000000000 +0200
+++ linux-omap-z71/arch/arm/mach-omap1/serial.c 2006-10-20 21:56:49.000000000 +0200
@@ -1,7 +1,7 @@
/*
- * linux/arch/arm/mach-omap1/id.c
+ * linux/arch/arm/mach-omap1/serial.c
*
- * OMAP1 CPU identification code
+ * OMAP1 serial port driver
*
* 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
@@ -59,7 +59,7 @@
omap_serial_outp(p, UART_OMAP_SCR, 0x08); /* TX watermark */
omap_serial_outp(p, UART_OMAP_MDR1, 0x00); /* enable UART */
- if (!cpu_is_omap1510()) {
+ if (!cpu_is_omap15xx()) {
omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
}
@@ -121,7 +121,7 @@
serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
}
- if (cpu_is_omap1510()) {
+ if (cpu_is_omap15xx()) {
serial_platform_data[0].uartclk = OMAP1510_BASE_BAUD * 16;
serial_platform_data[1].uartclk = OMAP1510_BASE_BAUD * 16;
serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
@@ -147,10 +147,10 @@
printk("Could not get uart1_ck\n");
else {
clk_enable(uart1_ck);
- if (cpu_is_omap1510())
+ if (cpu_is_omap15xx())
clk_set_rate(uart1_ck, 12000000);
}
- if (cpu_is_omap1510()) {
+ if (cpu_is_omap15xx()) {
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
if (machine_is_omap_innovator()) {
@@ -167,12 +167,12 @@
printk("Could not get uart2_ck\n");
else {
clk_enable(uart2_ck);
- if (cpu_is_omap1510())
+ if (cpu_is_omap15xx())
clk_set_rate(uart2_ck, 12000000);
else
clk_set_rate(uart2_ck, 48000000);
}
- if (cpu_is_omap1510()) {
+ if (cpu_is_omap15xx()) {
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
if (machine_is_omap_innovator()) {
@@ -189,10 +189,10 @@
printk("Could not get uart3_ck\n");
else {
clk_enable(uart3_ck);
- if (cpu_is_omap1510())
+ if (cpu_is_omap15xx())
clk_set_rate(uart3_ck, 12000000);
}
- if (cpu_is_omap1510()) {
+ if (cpu_is_omap15xx()) {
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);
}
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] PalmZ71 - OMAP310 Serial
2006-10-24 15:21 [PATCH 2/4] PalmZ71 - OMAP310 Serial Marek Vašut
@ 2006-10-25 23:55 ` Marek Vašut
2006-10-26 21:27 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vašut @ 2006-10-25 23:55 UTC (permalink / raw)
To: linux-omap-open-source
Dne úterý 24 říjen 2006 17:21 jste napsal(a):
> Hi,
> this makes serial usable also on omap310, not only 1510.
> (changing 1510->15xx)
Signed-off-by: Marek Vašut <marek.vasut@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] PalmZ71 - OMAP310 Serial
2006-10-25 23:55 ` Marek Vašut
@ 2006-10-26 21:27 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2006-10-26 21:27 UTC (permalink / raw)
To: Marek Vašut; +Cc: linux-omap-open-source
* Marek Vašut <marek.vasut@gmail.com> [061026 03:01]:
> Dne úterý 24 říjen 2006 17:21 jste napsal(a):
> > Hi,
> > this makes serial usable also on omap310, not only 1510.
> > (changing 1510->15xx)
> Signed-off-by: Marek Vašut <marek.vasut@gmail.com>
Pushing today.
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-10-26 21:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-24 15:21 [PATCH 2/4] PalmZ71 - OMAP310 Serial Marek Vašut
2006-10-25 23:55 ` Marek Vašut
2006-10-26 21:27 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox