Blackfin serial driver updates for 2.6.27
cover Blackfin serial driver updates for 2.6.27
Hi Alan,
These are bunch of Blackfin serial driver updates and fixing for 2.6.27.
Thanks a lot
-Bryan
PATCH 1/8 Blackfin Serial Driver: use __initdata for data, not __init
From: Mike Frysinger <[email protected]>
--- drivers/serial/bfin_5xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/serial/bfin_5xx.c +1 -1
@@ -1056,7 +1056,7 @@ static __init void early_serial_write(struct console *con, const char *s, } } -static struct __init console bfin_early_serial_console = { +static struct __initdata console bfin_early_serial_console = { .name ="early_BFuart" , .write = early_serial_write, .device = uart_console_device,
Signature · 1 line
1.5.6
PATCH 2/8 Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports.
In reply to Bryan WuFrom: Sonic Zhang <[email protected]>
--- drivers/serial/bfin_5xx.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-)
drivers/serial/bfin_5xx.c +22 -17
@@ -1100,20 +1100,26 @@ static struct uart_driver bfin_serial_reg = {static int bfin_serial_suspend (struct platform_device *dev,pm_message_t state) { -struct bfin_serial_port *uart =platform_get_drvdata (dev); +int i; -if (uart) -uart_suspend_port (&bfin_serial_reg, &uart->port); +for (i =0 ; i < nr_ports; i++) { +if (bfin_serial_ports[i].port.dev != &dev->dev) +continue ; +uart_suspend_port (&bfin_serial_reg, &bfin_serial_ports[i].port); + }return 0 ; }static int bfin_serial_resume (struct platform_device *dev) { -struct bfin_serial_port *uart =platform_get_drvdata (dev); +int i; -if (uart) -uart_resume_port (&bfin_serial_reg, &uart->port); +for (i =0 ; i < nr_ports; i++) { +if (bfin_serial_ports[i].port.dev != &dev->dev) +continue ; +uart_resume_port (&bfin_serial_reg, &bfin_serial_ports[i].port); + }return 0 ; }
@@ -1133,27 +1139,26 @@ static int bfin_serial_probe(struct platform_device *dev)continue ; bfin_serial_ports[i].port.dev = &dev->dev;uart_add_one_port (&bfin_serial_reg, &bfin_serial_ports[i].port); -platform_set_drvdata (dev, &bfin_serial_ports[i]); } }return 0 ; } -static int bfin_serial_remove (struct platform_device *pdev) +static int bfin_serial_remove (struct platform_device *dev) { -struct bfin_serial_port *uart =platform_get_drvdata (pdev); - +int i; +for (i =0 ; i < nr_ports; i++) { +if (bfin_serial_ports[i].port.dev != &dev->dev) +continue ; +uart_remove_one_port (&bfin_serial_reg, &bfin_serial_ports[i].port); + bfin_serial_ports[i].port.dev =NULL ;#ifdef CONFIG_SERIAL_BFIN_CTSRTS -gpio_free (uart->cts_pin); -gpio_free (uart->rts_pin); +gpio_free (bfin_serial_ports[i].cts_pin); +gpio_free (bfin_serial_ports[i].rts_pin);#endif - -platform_set_drvdata (pdev,NULL ); - -if (uart) -uart_remove_one_port (&bfin_serial_reg, &uart->port); + }return 0 ; }
Signature · 1 line
1.5.6
PATCH 3/8 Blackfin Serial Driver: trim trailing whitespace -- no functional changes
In reply to Bryan WuFrom: Mike Frysinger <[email protected]>
--- drivers/serial/bfin_5xx.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/serial/bfin_5xx.c +4 -4
@@ -1,7 +1,7 @@/* * Blackfin On-Chip Serial Driver * -* Copyright 2006-2007 Analog Devices Inc. +* Copyright 2006-2008 Analog Devices Inc. * * Enter bugs at http://blackfin.uclinux.org/ *
@@ -126,13 +126,13 @@ static int kgdb_entry_state;void kgdb_put_debug_char (int chr) {struct bfin_serial_port *uart; - +if (CONFIG_KGDB_UART_PORT <0 ||CONFIG_KGDB_UART_PORT >=BFIN_UART_NR_PORTS ) uart = &bfin_serial_ports[0 ];else uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ]; - +while (!(UART_GET_LSR (uart) &THRE )) {SSYNC (); }
@@ -152,7 +152,7 @@ int kgdb_get_debug_char(void) uart = &bfin_serial_ports[0 ]; else uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ]; - +while (!(UART_GET_LSR (uart) &DR )) {SSYNC (); }
Signature · 1 line
1.5.6
PATCH 4/8 Blackfin Serial Driver: move common variables out of serial headers and into the serial driver
In reply to Bryan WuFrom: Mike Frysinger <[email protected]>
move common variables out of serial headers and into the serial driver and rename "nr_ports" to "nr_active_ports" so as to easily differentiat between BFIN_UART_NR_PORTS (the # of available) and nr_ports (the # of enabled)
--- drivers/serial/bfin_5xx.c | 17 ++++++++++------- include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 3 --- include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 -- include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 3 --- include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 3 --- include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 -- 6 files changed, 10 insertions(+), 20 deletions(-)
drivers/serial/bfin_5xx.c +10 -7
@@ -42,6 +42,9 @@#define BFIN_SERIAL_MAJOR 204#define BFIN_SERIAL_MINOR 64 +static struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ]; +static int nr_active_ports =ARRAY_SIZE (bfin_serial_resource); +/* * Setup for console. Argument comes from the menuconfig */
@@ -859,7 +862,7 @@ static void __init bfin_serial_init_ports(void)return ; first =0 ; -for (i =0 ; i < nr_ports; i++) { +for (i =0 ; i < nr_active_ports; i++) { bfin_serial_ports[i].port.uartclk =get_sclk (); bfin_serial_ports[i].port.ops = &bfin_serial_pops; bfin_serial_ports[i].port.line = i;
@@ -961,7 +964,7 @@ bfin_serial_console_setup(struct console *co, char *options)* if so, search for the first available port that does have * console support. */ -if (co->index ==-1 || co->index >= nr_ports) +if (co->index ==-1 || co->index >= nr_active_ports) co->index =0 ; uart = &bfin_serial_ports[co->index];
@@ -1072,7 +1075,7 @@ struct console __init *bfin_earlyserial_init(unsigned int port,struct bfin_serial_port *uart;struct ktermios t; -if (port ==-1 || port >= nr_ports) +if (port ==-1 || port >= nr_active_ports) port =0 ;bfin_serial_init_ports (); bfin_early_serial_console.index = port;
@@ -1102,7 +1105,7 @@ static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state) {int i; -for (i =0 ; i < nr_ports; i++) { +for (i =0 ; i < nr_active_ports; i++) {if (bfin_serial_ports[i].port.dev != &dev->dev)continue ;uart_suspend_port (&bfin_serial_reg, &bfin_serial_ports[i].port);
@@ -1115,7 +1118,7 @@ static int bfin_serial_resume(struct platform_device *dev) {int i; -for (i =0 ; i < nr_ports; i++) { +for (i =0 ; i < nr_active_ports; i++) {if (bfin_serial_ports[i].port.dev != &dev->dev)continue ;uart_resume_port (&bfin_serial_reg, &bfin_serial_ports[i].port);
@@ -1134,7 +1137,7 @@ static int bfin_serial_probe(struct platform_device *dev)break ;if (i < dev->num_resources) { -for (i =0 ; i < nr_ports; i++, res++) { +for (i =0 ; i < nr_active_ports; i++, res++) {if (bfin_serial_ports[i].port.mapbase != res->start)continue ; bfin_serial_ports[i].port.dev = &dev->dev;
@@ -1149,7 +1152,7 @@ static int bfin_serial_remove(struct platform_device *dev) {int i; -for (i =0 ; i < nr_ports; i++) { +for (i =0 ; i < nr_active_ports; i++) {if (bfin_serial_ports[i].port.dev != &dev->dev)continue ;uart_remove_one_port (&bfin_serial_reg, &bfin_serial_ports[i].port);
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +0 -3
@@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)bfin_write16 (uart->port.membase +OFFSET_LSR ,-1 ); } -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ];struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq;
@@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {#endif }; -int nr_ports =ARRAY_SIZE (bfin_serial_resource); -#define DRIVER_NAME "bfin-uart"static void bfin_serial_hw_init (struct bfin_serial_port *uart)
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +0 -2
@@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)bfin_write16 (uart->port.membase +OFFSET_LSR ,-1 ); } -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ];struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq;
@@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {#define DRIVER_NAME "bfin-uart" -int nr_ports =BFIN_UART_NR_PORTS ;static void bfin_serial_hw_init (struct bfin_serial_port *uart) {
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +0 -3
@@ -119,7 +119,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)bfin_write16 (uart->port.membase +OFFSET_LSR ,-1 ); } -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ];struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq;
@@ -164,8 +163,6 @@ struct bfin_serial_res bfin_serial_resource[] = {#endif }; -int nr_ports =ARRAY_SIZE (bfin_serial_resource); -#define DRIVER_NAME "bfin-uart"static void bfin_serial_hw_init (struct bfin_serial_port *uart)
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +0 -3
@@ -105,7 +105,6 @@ struct bfin_serial_port {#endif }; -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ];struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq;
@@ -170,8 +169,6 @@ struct bfin_serial_res bfin_serial_resource[] = {#endif }; -int nr_ports =ARRAY_SIZE (bfin_serial_resource); -#define DRIVER_NAME "bfin-uart"static void bfin_serial_hw_init (struct bfin_serial_port *uart)
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +0 -2
@@ -111,7 +111,6 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)bfin_write16 (uart->port.membase +OFFSET_LSR ,-1 ); } -struct bfin_serial_port bfin_serial_ports[BFIN_UART_NR_PORTS ];struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq;
@@ -142,7 +141,6 @@ struct bfin_serial_res bfin_serial_resource[] = {#define DRIVER_NAME "bfin-uart" -int nr_ports =BFIN_UART_NR_PORTS ;static void bfin_serial_hw_init (struct bfin_serial_port *uart) {
Signature · 1 line
1.5.6
PATCH 5/8 Blackfin Serial Driver: Remove useless stop
In reply to Bryan WuFrom: Sonic Zhang <[email protected]>
--- drivers/serial/bfin_5xx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
drivers/serial/bfin_5xx.c +0 -3
@@ -320,9 +320,6 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (&uart->port); - -if (uart_circ_empty (xmit)) -bfin_serial_stop_tx (&uart->port); }static irqreturn_t bfin_serial_rx_int (int irq,void *dev_id)
Signature · 1 line
1.5.6
PATCH 6/8 Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer.
In reply to Bryan WuFrom: Sonic Zhang <[email protected]>
Disable irq and return immediately.
--- drivers/serial/bfin_5xx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/serial/bfin_5xx.c +5 -1
@@ -301,7 +301,11 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart)bfin_serial_mctrl_check (uart);if (uart_circ_empty (xmit) ||uart_tx_stopped (&uart->port)) { -bfin_serial_stop_tx (&uart->port); +#ifdef CONFIG_BF54x +/* Clear TFI bit */ +UART_PUT_LSR (uart,TFI ); +#endif +UART_CLEAR_IER (uart,ETBEI );return ; }
Signature · 1 line
1.5.6
PATCH 7/8 Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART
In reply to Bryan WuFrom: Graf Yang <[email protected]>
We now use the sir_dev/irtty_sir/uart/bfin_serial drivers framework to monitor the TX status.
--- drivers/serial/bfin_5xx.c | 4 ++++ include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 3 +++ include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 ++ include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 3 +++ include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 3 +++ include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 ++ 6 files changed, 17 insertions(+), 0 deletions(-)
drivers/serial/bfin_5xx.c +4 -0
@@ -761,6 +761,9 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, val |=UCEN ;UART_PUT_GCTL (uart, val); +/* Port speed changed, update the per-port timeout. */ +uart_update_timeout (port, termios->c_cflag, baud); +spin_unlock_irqrestore (&uart->port.lock, flags); }
@@ -865,6 +868,7 @@ static void __init bfin_serial_init_ports(void)for (i =0 ; i < nr_active_ports; i++) { bfin_serial_ports[i].port.uartclk =get_sclk (); + bfin_serial_ports[i].port.fifosize =BFIN_UART_TX_FIFO_SIZE ; bfin_serial_ports[i].port.ops = &bfin_serial_pops; bfin_serial_ports[i].port.line = i; bfin_serial_ports[i].port.iotype =UPIO_MEM ;
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +3 -0
@@ -78,6 +78,9 @@# define CONFIG_UART1_RTS_PIN -1# endif #endif + +#define BFIN_UART_TX_FIFO_SIZE 2 +/* * The pin configuration is different from schematic */
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +2 -0
@@ -69,6 +69,8 @@# endif #endif +#define BFIN_UART_TX_FIFO_SIZE 2 +struct bfin_serial_port {struct uart_port port;unsigned int old_status;
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +3 -0
@@ -78,6 +78,9 @@# define CONFIG_UART1_RTS_PIN -1# endif #endif + +#define BFIN_UART_TX_FIFO_SIZE 2 +/* * The pin configuration is different from schematic */
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +3 -0
@@ -82,6 +82,9 @@# define CONFIG_UART1_RTS_PIN -1# endif #endif + +#define BFIN_UART_TX_FIFO_SIZE 2 +/* * The pin configuration is different from schematic */
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +2 -0
@@ -69,6 +69,8 @@# endif #endif +#define BFIN_UART_TX_FIFO_SIZE 2 +struct bfin_serial_port {struct uart_port port;unsigned int old_status;
Signature · 1 line
1.5.6
PATCH 8/8 Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode
In reply to Bryan WuFrom: Sonic Zhang <[email protected]>
--- arch/blackfin/kernel/bfin_dma_5xx.c | 13 ++++----- drivers/serial/bfin_5xx.c | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 7 deletions(-)
arch/blackfin/kernel/bfin_dma_5xx.c +6 -7
@@ -117,15 +117,14 @@ int request_dma(unsigned int channel, char *device_id)#ifdef CONFIG_BF54xif (channel >=CH_UART2_RX && channel <=CH_UART3_TX ) { -if (strncmp (device_id,"BFIN_UART" ,9 ) ==0 ) { - dma_ch[channel].regs->peripheral_map &=0x0FFF ; - dma_ch[channel].regs->peripheral_map |= +unsigned int per_map; + per_map = dma_ch[channel].regs->peripheral_map &0xFFF ; +if (strncmp (device_id,"BFIN_UART" ,9 ) ==0 ) + dma_ch[channel].regs->peripheral_map = per_map | ((channel -CH_UART2_RX +0xC )<<12 ); - }else { - dma_ch[channel].regs->peripheral_map &=0x0FFF ; - dma_ch[channel].regs->peripheral_map |= +else + dma_ch[channel].regs->peripheral_map = per_map | ((channel -CH_UART2_RX +0x6 )<<12 ); - } }#endif
drivers/serial/bfin_5xx.c +50 -0
62 lines not on this page · raw message
Signature · 1 line
1.5.6