2 files changed, 14 insertions, 2 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 202fb5c99b83..cf627cd1b4c8 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -699,14 +699,14 @@ config BFIN_UART1_CTSRTS
 
 config UART1_CTS_PIN
         int "UART1 CTS pin"
-        depends on BFIN_UART1_CTSRTS && (BF53x || BF561)
+        depends on BFIN_UART1_CTSRTS && !BF54x
         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 && (BF53x || BF561)
+        depends on BFIN_UART1_CTSRTS && !BF54x
         default -1
         help
           Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index af866ab3f5a1..69ac7007682e 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -579,7 +579,11 @@ static unsigned int bfin_serial_get_mctrl(struct uart_port *port)
         if (uart->cts_pin < 0)
                 return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
 
+# ifdef BF54x
+        if (UART_GET_MSR(uart) & CTS)
+# else
         if (gpio_get_value(uart->cts_pin))
+# endif
                 return TIOCM_DSR | TIOCM_CAR;
         else
 #endif
@@ -594,9 +598,17 @@ static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
                 return;
 
         if (mctrl & TIOCM_RTS)
+# ifdef BF54x
+                UART_PUT_MCR(uart, UART_GET_MCR(uart) & ~MRTS);
+# else
                 gpio_set_value(uart->rts_pin, 0);
+# endif
         else
+# ifdef BF54x
+                UART_PUT_MCR(uart, UART_GET_MCR(uart) | MRTS);
+# else
                 gpio_set_value(uart->rts_pin, 1);
+# endif
 #endif
 }