projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[linux-2.6-block.git]
/
arch
/
arm
/
mach-omap1
/
serial.c
diff --git
a/arch/arm/mach-omap1/serial.c
b/arch/arm/mach-omap1/serial.c
index 9b4cd698bec85d9d05b06371313066579b9d3c41..10a4fe88b2fd5993a9b8d262f63f9aea4dca5381 100644
(file)
--- a/
arch/arm/mach-omap1/serial.c
+++ b/
arch/arm/mach-omap1/serial.c
@@
-1,17
+1,17
@@
/*
/*
- * linux/arch/arm/mach-omap1/
id
.c
+ * linux/arch/arm/mach-omap1/
serial
.c
*
*
- * OMAP1
CPU identification code
+ * OMAP1
serial support.
*
* 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.
*/
*
* 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/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/serial.h>
#include <linux/tty.h>
#include <linux/delay.h>
#include <linux/serial.h>
#include <linux/tty.h>
@@
-59,7
+59,7
@@
static void __init omap_serial_reset(struct plat_serial8250_port *p)
omap_serial_outp(p, UART_OMAP_SCR, 0x08); /* TX watermark */
omap_serial_outp(p, UART_OMAP_MDR1, 0x00); /* enable UART */
omap_serial_outp(p, UART_OMAP_SCR, 0x08); /* TX watermark */
omap_serial_outp(p, UART_OMAP_MDR1, 0x00); /* enable UART */
- if (!cpu_is_omap15
10
()) {
+ if (!cpu_is_omap15
xx
()) {
omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
}
omap_serial_outp(p, UART_OMAP_SYSC, 0x01);
while (!(omap_serial_in(p, UART_OMAP_SYSC) & 0x01));
}
@@
-121,7
+121,7
@@
void __init omap_serial_init(void)
serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
}
serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
}
- if (cpu_is_omap15
10
()) {
+ if (cpu_is_omap15
xx
()) {
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;
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
@@
void __init omap_serial_init(void)
printk("Could not get uart1_ck\n");
else {
clk_enable(uart1_ck);
printk("Could not get uart1_ck\n");
else {
clk_enable(uart1_ck);
- if (cpu_is_omap15
10
())
+ if (cpu_is_omap15
xx
())
clk_set_rate(uart1_ck, 12000000);
}
clk_set_rate(uart1_ck, 12000000);
}
- if (cpu_is_omap15
10
()) {
+ if (cpu_is_omap15
xx
()) {
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
if (machine_is_omap_innovator()) {
omap_cfg_reg(UART1_TX);
omap_cfg_reg(UART1_RTS);
if (machine_is_omap_innovator()) {
@@
-167,12
+167,12
@@
void __init omap_serial_init(void)
printk("Could not get uart2_ck\n");
else {
clk_enable(uart2_ck);
printk("Could not get uart2_ck\n");
else {
clk_enable(uart2_ck);
- if (cpu_is_omap15
10
())
+ if (cpu_is_omap15
xx
())
clk_set_rate(uart2_ck, 12000000);
else
clk_set_rate(uart2_ck, 48000000);
}
clk_set_rate(uart2_ck, 12000000);
else
clk_set_rate(uart2_ck, 48000000);
}
- if (cpu_is_omap15
10
()) {
+ if (cpu_is_omap15
xx
()) {
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
if (machine_is_omap_innovator()) {
omap_cfg_reg(UART2_TX);
omap_cfg_reg(UART2_RTS);
if (machine_is_omap_innovator()) {
@@
-189,10
+189,10
@@
void __init omap_serial_init(void)
printk("Could not get uart3_ck\n");
else {
clk_enable(uart3_ck);
printk("Could not get uart3_ck\n");
else {
clk_enable(uart3_ck);
- if (cpu_is_omap15
10
())
+ if (cpu_is_omap15
xx
())
clk_set_rate(uart3_ck, 12000000);
}
clk_set_rate(uart3_ck, 12000000);
}
- if (cpu_is_omap15
10
()) {
+ if (cpu_is_omap15
xx
()) {
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);
}
omap_cfg_reg(UART3_TX);
omap_cfg_reg(UART3_RX);
}
@@
-204,8
+204,7
@@
void __init omap_serial_init(void)
#ifdef CONFIG_OMAP_SERIAL_WAKE
#ifdef CONFIG_OMAP_SERIAL_WAKE
-static irqreturn_t omap_serial_wake_interrupt(int irq, void *dev_id,
- struct pt_regs *regs)
+static irqreturn_t omap_serial_wake_interrupt(int irq, void *dev_id)
{
/* Need to do something with serial port right after wake-up? */
return IRQ_HANDLED;
{
/* Need to do something with serial port right after wake-up? */
return IRQ_HANDLED;
@@
-253,7
+252,7
@@
static void __init omap_serial_set_port_wakeup(int gpio_nr)
}
omap_set_gpio_direction(gpio_nr, 1);
ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
}
omap_set_gpio_direction(gpio_nr, 1);
ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
-
SA
_TRIGGER_RISING, "serial wakeup", NULL);
+
IRQF
_TRIGGER_RISING, "serial wakeup", NULL);
if (ret) {
omap_free_gpio(gpio_nr);
printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",
if (ret) {
omap_free_gpio(gpio_nr);
printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",