|
@@ -746,15 +746,6 @@ static int bfin_serial_startup(struct uart_port *port)
|
|
Status interrupt.\n");
|
|
Status interrupt.\n");
|
|
}
|
|
}
|
|
|
|
|
|
- if (uart->cts_pin >= 0) {
|
|
|
|
- gpio_request(uart->cts_pin, DRIVER_NAME);
|
|
|
|
- gpio_direction_output(uart->cts_pin, 1);
|
|
|
|
- }
|
|
|
|
- if (uart->rts_pin >= 0) {
|
|
|
|
- gpio_request(uart->rts_pin, DRIVER_NAME);
|
|
|
|
- gpio_direction_output(uart->rts_pin, 0);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/* CTS RTS PINs are negative assertive. */
|
|
/* CTS RTS PINs are negative assertive. */
|
|
UART_PUT_MCR(uart, ACTS);
|
|
UART_PUT_MCR(uart, ACTS);
|
|
UART_SET_IER(uart, EDSSI);
|
|
UART_SET_IER(uart, EDSSI);
|
|
@@ -801,10 +792,6 @@ static void bfin_serial_shutdown(struct uart_port *port)
|
|
gpio_free(uart->rts_pin);
|
|
gpio_free(uart->rts_pin);
|
|
#endif
|
|
#endif
|
|
#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
|
|
#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
|
|
- if (uart->cts_pin >= 0)
|
|
|
|
- gpio_free(uart->cts_pin);
|
|
|
|
- if (uart->rts_pin >= 0)
|
|
|
|
- gpio_free(uart->rts_pin);
|
|
|
|
if (UART_GET_IER(uart) && EDSSI)
|
|
if (UART_GET_IER(uart) && EDSSI)
|
|
free_irq(uart->status_irq, uart);
|
|
free_irq(uart->status_irq, uart);
|
|
#endif
|
|
#endif
|
|
@@ -1409,8 +1396,7 @@ static int bfin_serial_remove(struct platform_device *dev)
|
|
continue;
|
|
continue;
|
|
uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
|
|
uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
|
|
bfin_serial_ports[i].port.dev = NULL;
|
|
bfin_serial_ports[i].port.dev = NULL;
|
|
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
|
|
|
|
- defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
|
|
|
|
|
|
+#if defined(CONFIG_SERIAL_BFIN_CTSRTS)
|
|
gpio_free(bfin_serial_ports[i].cts_pin);
|
|
gpio_free(bfin_serial_ports[i].cts_pin);
|
|
gpio_free(bfin_serial_ports[i].rts_pin);
|
|
gpio_free(bfin_serial_ports[i].rts_pin);
|
|
#endif
|
|
#endif
|