|
@@ -74,8 +74,8 @@ static void bfin_serial_tx_chars(struct bfin_serial_port *uart);
|
|
|
|
|
|
static void bfin_serial_reset_irda(struct uart_port *port);
|
|
static void bfin_serial_reset_irda(struct uart_port *port);
|
|
|
|
|
|
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
|
|
|
|
- defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
|
|
|
|
|
|
+#if defined(SERIAL_BFIN_CTSRTS) || \
|
|
|
|
+ defined(SERIAL_BFIN_HARD_CTSRTS)
|
|
static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
|
|
static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
|
|
{
|
|
{
|
|
struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
|
|
struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
|
|
@@ -110,7 +110,7 @@ static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
|
|
struct bfin_serial_port *uart = dev_id;
|
|
struct bfin_serial_port *uart = dev_id;
|
|
struct uart_port *uport = &uart->port;
|
|
struct uart_port *uport = &uart->port;
|
|
unsigned int status = bfin_serial_get_mctrl(uport);
|
|
unsigned int status = bfin_serial_get_mctrl(uport);
|
|
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_HARD_CTSRTS
|
|
|
|
|
|
UART_CLEAR_SCTS(uart);
|
|
UART_CLEAR_SCTS(uart);
|
|
if (uport->hw_stopped) {
|
|
if (uport->hw_stopped) {
|
|
@@ -700,7 +700,7 @@ static int bfin_serial_startup(struct uart_port *port)
|
|
# endif
|
|
# endif
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_CTSRTS
|
|
if (uart->cts_pin >= 0) {
|
|
if (uart->cts_pin >= 0) {
|
|
if (request_irq(gpio_to_irq(uart->cts_pin),
|
|
if (request_irq(gpio_to_irq(uart->cts_pin),
|
|
bfin_serial_mctrl_cts_int,
|
|
bfin_serial_mctrl_cts_int,
|
|
@@ -718,7 +718,7 @@ static int bfin_serial_startup(struct uart_port *port)
|
|
gpio_direction_output(uart->rts_pin, 0);
|
|
gpio_direction_output(uart->rts_pin, 0);
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_HARD_CTSRTS
|
|
if (uart->cts_pin >= 0) {
|
|
if (uart->cts_pin >= 0) {
|
|
if (request_irq(uart->status_irq, bfin_serial_mctrl_cts_int,
|
|
if (request_irq(uart->status_irq, bfin_serial_mctrl_cts_int,
|
|
0, "BFIN_UART_MODEM_STATUS", uart)) {
|
|
0, "BFIN_UART_MODEM_STATUS", uart)) {
|
|
@@ -766,13 +766,13 @@ static void bfin_serial_shutdown(struct uart_port *port)
|
|
free_irq(uart->tx_irq, uart);
|
|
free_irq(uart->tx_irq, uart);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_CTSRTS
|
|
if (uart->cts_pin >= 0)
|
|
if (uart->cts_pin >= 0)
|
|
free_irq(gpio_to_irq(uart->cts_pin), uart);
|
|
free_irq(gpio_to_irq(uart->cts_pin), uart);
|
|
if (uart->rts_pin >= 0)
|
|
if (uart->rts_pin >= 0)
|
|
gpio_free(uart->rts_pin);
|
|
gpio_free(uart->rts_pin);
|
|
#endif
|
|
#endif
|
|
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_HARD_CTSRTS
|
|
if (uart->cts_pin >= 0)
|
|
if (uart->cts_pin >= 0)
|
|
free_irq(uart->status_irq, uart);
|
|
free_irq(uart->status_irq, uart);
|
|
#endif
|
|
#endif
|
|
@@ -788,7 +788,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
|
|
unsigned int ier, lcr = 0;
|
|
unsigned int ier, lcr = 0;
|
|
unsigned long timeout;
|
|
unsigned long timeout;
|
|
|
|
|
|
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
|
|
|
|
|
|
+#ifdef SERIAL_BFIN_CTSRTS
|
|
if (old == NULL && uart->cts_pin != -1)
|
|
if (old == NULL && uart->cts_pin != -1)
|
|
termios->c_cflag |= CRTSCTS;
|
|
termios->c_cflag |= CRTSCTS;
|
|
else if (uart->cts_pin == -1)
|
|
else if (uart->cts_pin == -1)
|
|
@@ -1110,8 +1110,8 @@ bfin_serial_console_setup(struct console *co, char *options)
|
|
int baud = 57600;
|
|
int baud = 57600;
|
|
int bits = 8;
|
|
int bits = 8;
|
|
int parity = 'n';
|
|
int parity = 'n';
|
|
-# if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
|
|
|
|
- defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
|
|
|
|
|
|
+# if defined(SERIAL_BFIN_CTSRTS) || \
|
|
|
|
+ defined(SERIAL_BFIN_HARD_CTSRTS)
|
|
int flow = 'r';
|
|
int flow = 'r';
|
|
# else
|
|
# else
|
|
int flow = 'n';
|
|
int flow = 'n';
|
|
@@ -1322,8 +1322,8 @@ static int bfin_serial_probe(struct platform_device *pdev)
|
|
init_timer(&(uart->rx_dma_timer));
|
|
init_timer(&(uart->rx_dma_timer));
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_SERIAL_BFIN_CTSRTS) || \
|
|
|
|
- defined(CONFIG_SERIAL_BFIN_HARD_CTSRTS)
|
|
|
|
|
|
+#if defined(SERIAL_BFIN_CTSRTS) || \
|
|
|
|
+ defined(SERIAL_BFIN_HARD_CTSRTS)
|
|
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
|
|
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
|
|
if (res == NULL)
|
|
if (res == NULL)
|
|
uart->cts_pin = -1;
|
|
uart->cts_pin = -1;
|