Blackfin Serial Driver: Fix bug - Enable hardware based CTS and RTS for bf548. - v2
PATCH 17/18 Blackfin Serial Driver: Fix bug - Enable hardware based CTS and RTS for bf548. - v2
Both software emulated and hardware based CTS and RTS are enabled in serial driver.
The CTS RTS PIN connection on BF548 UART port is defined as a host machine. If test it under Linux with the other PC host, 2 hosts are connected together. Please make a cross UART cable to exchange CTS and RTS signal.
Signed-off-by Sonic Zhang <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- .../mach-bf518/include/mach/bfin_serial_5xx.h | 10 +- .../mach-bf527/include/mach/bfin_serial_5xx.h | 10 +- .../mach-bf533/include/mach/bfin_serial_5xx.h | 13 +- .../mach-bf537/include/mach/bfin_serial_5xx.h | 10 +- .../mach-bf538/include/mach/bfin_serial_5xx.h | 10 +- .../mach-bf548/include/mach/bfin_serial_5xx.h | 72 ++++----- .../mach-bf561/include/mach/bfin_serial_5xx.h | 9 +- drivers/serial/Kconfig | 26 +++- drivers/serial/bfin_5xx.c | 169 ++++++++++++++------ 9 files changed, 211 insertions(+), 118 deletions(-)
arch/blackfin/mach-bf518/include/mach/bfin_serial_5xx.h +7 -3
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -87,6 +87,7 @@struct bfin_serial_port {struct uart_port port;unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -125,6 +126,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -140,6 +142,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART0_RX , +IRQ_UART0_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART0_TX , CH_UART0_RX,
@@ -154,6 +157,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC02000 ,IRQ_UART1_RX , +IRQ_UART1_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART1_TX , CH_UART1_RX,
arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h +7 -3
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -87,6 +87,7 @@struct bfin_serial_port {struct uart_port port;unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -125,6 +126,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -140,6 +142,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART0_RX , +IRQ_UART0_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART0_TX , CH_UART0_RX,
@@ -154,6 +157,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC02000 ,IRQ_UART1_RX , +IRQ_UART1_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART1_TX , CH_UART1_RX,
arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h +8 -5
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -72,8 +72,9 @@#define BFIN_UART_TX_FIFO_SIZE 2struct bfin_serial_port { -struct uart_port port; -unsigned int old_status; +struct uart_port port; +unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -116,6 +117,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -130,6 +132,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART_RX , +IRQ_UART_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART_TX , CH_UART_RX,
arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h +7 -3
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -87,6 +87,7 @@struct bfin_serial_port {struct uart_port port;unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -124,6 +125,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -139,6 +141,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART0_RX , +IRQ_UART0_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART0_TX , CH_UART0_RX,
@@ -153,6 +156,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC02000 ,IRQ_UART1_RX , +IRQ_UART1_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART1_TX , CH_UART1_RX,
arch/blackfin/mach-bf538/include/mach/bfin_serial_5xx.h +7 -3
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -87,6 +87,7 @@struct bfin_serial_port {struct uart_port port;unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -125,6 +126,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -140,6 +142,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART0_RX , +IRQ_UART0_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART0_TX , CH_UART0_RX,
@@ -154,6 +157,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC02000 ,IRQ_UART1_RX , +IRQ_UART1_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART1_TX , CH_UART1_RX,
arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h +32 -40
154 lines not on this page · raw message
arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h +6 -3
@@ -53,9 +53,9 @@#define UART_SET_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) | DLAB); SSYNC(); } while (0)#define UART_CLEAR_DLAB (uart) do { UART_PUT_LCR(uart, UART_GET_LCR(uart) & ~DLAB); SSYNC(); } while (0) -#define UART_GET_CTS (x) gpio_get_value(x->cts_pin) -#define UART_SET_RTS (x) gpio_set_value(x->rts_pin, 1) -#define UART_CLEAR_RTS (x) gpio_set_value(x->rts_pin, 0) +#define UART_GET_CTS (x) (!gpio_get_value(x->cts_pin)) +#define UART_DISABLE_RTS (x) gpio_set_value(x->rts_pin, 1) +#define UART_ENABLE_RTS (x) gpio_set_value(x->rts_pin, 0)#define UART_ENABLE_INTS (x, v) UART_PUT_IER(x, v)#define UART_DISABLE_INTS (x) UART_PUT_IER(x, 0)
@@ -74,6 +74,7 @@struct bfin_serial_port {struct uart_port port;unsigned int old_status; +int status_irq;unsigned int lsr;#ifdef CONFIG_SERIAL_BFIN_DMA int tx_done;
@@ -116,6 +117,7 @@ static inline void UART_CLEAR_LSR(struct bfin_serial_port *uart)struct bfin_serial_res {unsigned long uart_base_addr;int uart_irq; +int uart_status_irq;#ifdef CONFIG_SERIAL_BFIN_DMA unsigned int uart_tx_dma_channel;unsigned int uart_rx_dma_channel;
@@ -130,6 +132,7 @@ struct bfin_serial_res bfin_serial_resource[] = { {0xFFC00400 ,IRQ_UART_RX , +IRQ_UART_ERROR , #ifdef CONFIG_SERIAL_BFIN_DMACH_UART_TX , CH_UART_RX,
drivers/serial/Kconfig +20 -6
@@ -727,7 +727,7 @@ config BFIN_UART0_CTSRTS config UART0_CTS_PIN int "UART0 CTS pin" - depends on BFIN_UART0_CTSRTS + depends on BFIN_UART0_CTSRTS && !BF548 default 23 help The default pin is GPIO_GP7.
@@ -735,7 +735,7 @@ config UART0_CTS_PIN config UART0_RTS_PIN int "UART0 RTS pin" - depends on BFIN_UART0_CTSRTS + depends on BFIN_UART0_CTSRTS && !BF548 default 22 help The default pin is GPIO_GP6.
@@ -756,14 +756,14 @@ config BFIN_UART1_CTSRTS config UART1_CTS_PIN int "UART1 CTS pin" - depends on BFIN_UART1_CTSRTS && !BF54x + depends on BFIN_UART1_CTSRTS && !BF548 default -1 help Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config UART1_RTS_PIN int "UART1 RTS pin" - depends on BFIN_UART1_CTSRTS && !BF54x + depends on BFIN_UART1_CTSRTS && !BF548 default -1 help Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
@@ -783,14 +783,14 @@ config BFIN_UART2_CTSRTS config UART2_CTS_PIN int "UART2 CTS pin" - depends on BFIN_UART2_CTSRTS + depends on BFIN_UART2_CTSRTS && !BF548 default -1 help Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. config UART2_RTS_PIN int "UART2 RTS pin" - depends on BFIN_UART2_CTSRTS + depends on BFIN_UART2_CTSRTS && !BF548 default -1 help Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
@@ -808,6 +808,20 @@ config BFIN_UART3_CTSRTS Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS signal. +config UART3_CTS_PIN + int "UART3 CTS pin" + depends on BFIN_UART3_CTSRTS && !BF548 + default -1 + help + Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. + +config UART3_RTS_PIN + int "UART3 RTS pin" + depends on BFIN_UART3_CTSRTS && !BF548 + default -1 + help + Refer to ./include/asm-blackfin/gpio.h to see the GPIO map. + config SERIAL_IMX bool "IMX serial port support" depends on ARM && (ARCH_IMX || ARCH_MXC)
drivers/serial/bfin_5xx.c +117 -52
239 lines not on this page · raw message
Signature · 1 line
1.6.0
Quoted 2 lines · On Tue, 10 Mar 2009 18:03:47 +0800 sonic zhang <[email protected]> wrote:
Both software emulated and hardware based CTS and RTS are enabled in serial driver.
In fact all four of these -v2 patches (03, 04, 05 and 17) were identical to the patches which I merged earlier this week.