Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / serial / serial_stm32x7.h

diff --git a/drivers/serial/serial_stm32x7.h b/drivers/serial/serial_stm32x7.h
index 4c6b7d4206dc7a93d86a054859369a3fde9897d8..b914edf28a11905399c236a4312da671474bd797 100644 (file)
--- a/drivers/serial/serial_stm32x7.h
+++ b/drivers/serial/serial_stm32x7.h
@@ -24,12 +24,28 @@ struct stm32_uart_info {
        u8 uart_enable_bit;     /* UART_CR1_UE */
        bool stm32f4;           /* true for STM32F4, false otherwise */
        bool has_overrun_disable;
+       bool has_fifo;
 };
 
-struct stm32_uart_info stm32x7_info = {
+struct stm32_uart_info stm32f4_info = {
+       .stm32f4 = true,
+       .uart_enable_bit = 13,
+       .has_overrun_disable = false,
+       .has_fifo = false,
+};
+
+struct stm32_uart_info stm32f7_info = {
+       .uart_enable_bit = 0,
+       .stm32f4 = false,
+       .has_overrun_disable = true,
+       .has_fifo = false,
+};
+
+struct stm32_uart_info stm32h7_info = {
        .uart_enable_bit = 0,
        .stm32f4 = false,
        .has_overrun_disable = true,
+       .has_fifo = true,
 };
 
 /* Information about a serial port */
@@ -39,6 +55,7 @@ struct stm32x7_serial_platdata {
        unsigned long int clock_rate;
 };
 
+#define USART_CR1_FIFOEN               BIT(29)
 #define USART_CR1_OVER8                        BIT(15)
 #define USART_CR1_TE                   BIT(3)
 #define USART_CR1_RE                   BIT(2)