Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue.
Blackfin arch: fix typo error in bf548 serial header file
+25
-29
+18
-22
drivers/serial/bfin_5xx.c
+18
-22
drivers/serial/bfin_5xx.c
···
49
49
#define DMA_RX_YCOUNT (PAGE_SIZE / DMA_RX_XCOUNT)
50
50
51
51
#define DMA_RX_FLUSH_JIFFIES (HZ / 50)
52
+
#define CTS_CHECK_JIFFIES (HZ / 50)
52
53
53
54
#ifdef CONFIG_SERIAL_BFIN_DMA
54
55
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart);
···
291
290
{
292
291
struct circ_buf *xmit = &uart->port.info->xmit;
293
292
294
-
if (uart->port.x_char) {
295
-
UART_PUT_CHAR(uart, uart->port.x_char);
296
-
uart->port.icount.tx++;
297
-
uart->port.x_char = 0;
298
-
}
299
293
/*
300
294
* Check the modem control lines before
301
295
* transmitting anything.
···
300
304
if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
301
305
bfin_serial_stop_tx(&uart->port);
302
306
return;
307
+
}
308
+
309
+
if (uart->port.x_char) {
310
+
UART_PUT_CHAR(uart, uart->port.x_char);
311
+
uart->port.icount.tx++;
312
+
uart->port.x_char = 0;
303
313
}
304
314
305
315
while ((UART_GET_LSR(uart) & THRE) && xmit->tail != xmit->head) {
···
347
345
}
348
346
#endif
349
347
350
-
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
351
-
static void bfin_serial_do_work(struct work_struct *work)
352
-
{
353
-
struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue);
354
-
355
-
bfin_serial_mctrl_check(uart);
356
-
}
357
-
#endif
358
-
359
348
#ifdef CONFIG_SERIAL_BFIN_DMA
360
349
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
361
350
{
362
351
struct circ_buf *xmit = &uart->port.info->xmit;
363
352
364
353
uart->tx_done = 0;
354
+
355
+
/*
356
+
* Check the modem control lines before
357
+
* transmitting anything.
358
+
*/
359
+
bfin_serial_mctrl_check(uart);
365
360
366
361
if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
367
362
uart->tx_count = 0;
···
371
372
uart->port.icount.tx++;
372
373
uart->port.x_char = 0;
373
374
}
374
-
375
-
/*
376
-
* Check the modem control lines before
377
-
* transmitting anything.
378
-
*/
379
-
bfin_serial_mctrl_check(uart);
380
375
381
376
uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
382
377
if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail))
···
558
565
uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
559
566
if (!(status & TIOCM_CTS)) {
560
567
tty->hw_stopped = 1;
561
-
schedule_work(&uart->cts_workqueue);
568
+
uart->cts_timer.data = (unsigned long)(uart);
569
+
uart->cts_timer.function = (void *)bfin_serial_mctrl_check;
570
+
uart->cts_timer.expires = jiffies + CTS_CHECK_JIFFIES;
571
+
add_timer(&(uart->cts_timer));
562
572
} else {
563
573
tty->hw_stopped = 0;
564
574
}
···
881
885
init_timer(&(bfin_serial_ports[i].rx_dma_timer));
882
886
#endif
883
887
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
884
-
INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work);
888
+
init_timer(&(bfin_serial_ports[i].cts_timer));
885
889
bfin_serial_ports[i].cts_pin =
886
890
bfin_serial_resource[i].uart_cts_pin;
887
891
bfin_serial_ports[i].rts_pin =
+1
-1
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+1
-1
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+1
-1
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+1
-1
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+1
-1
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+1
-1
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+3
-3
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+3
-3
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
···
99
99
struct work_struct tx_dma_workqueue;
100
100
#endif
101
101
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
102
-
struct work_struct cts_workqueue;
102
+
struct timer_list cts_timer;
103
103
int cts_pin;
104
104
int rts_pin;
105
105
#endif
···
187
187
188
188
#ifdef CONFIG_BFIN_UART1_CTSRTS
189
189
peripheral_request(P_UART1_RTS, DRIVER_NAME);
190
-
peripheral_request(P_UART1_CTS DRIVER_NAME);
190
+
peripheral_request(P_UART1_CTS, DRIVER_NAME);
191
191
#endif
192
192
#endif
193
193
···
202
202
203
203
#ifdef CONFIG_BFIN_UART3_CTSRTS
204
204
peripheral_request(P_UART3_RTS, DRIVER_NAME);
205
-
peripheral_request(P_UART3_CTS DRIVER_NAME);
205
+
peripheral_request(P_UART3_CTS, DRIVER_NAME);
206
206
#endif
207
207
#endif
208
208
SSYNC();