serial: stm32: Fix bits defines name

Rename USART_ISR_FLAG_xxx bits to USART_ISR_xxx bits and
USART_ICR_OREF to USART_ICR_ORECF in order to match datasheets.
Sort defines by descendant order.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c
index 724d6f967246d35f48990f84523aa71c076bea56..eeaa8ab050d912bc5f11d4e636b13c191bc26651 100644 (file)
--- a/drivers/serial/serial_stm32.c
+++ b/drivers/serial/serial_stm32.c
@@ -54,12 +54,12 @@ static int stm32_serial_getc(struct udevice *dev)
        fdt_addr_t base = plat->base;
        u32 isr = readl(base + ISR_OFFSET(stm32f4));
 
-       if ((isr & USART_ISR_FLAG_RXNE) == 0)
+       if ((isr & USART_ISR_RXNE) == 0)
                return -EAGAIN;
 
-       if (isr & USART_ISR_FLAG_ORE) {
+       if (isr & (USART_ISR_ORE)) {
                if (!stm32f4)
-                       setbits_le32(base + ICR_OFFSET, USART_ICR_OREF);
+                       setbits_le32(base + ICR_OFFSET, USART_ICR_ORECF);
                else
                        readl(base + RDR_OFFSET(stm32f4));
                return -EIO;
@@ -74,7 +74,7 @@ static int _stm32_serial_putc(fdt_addr_t base,
 {
        bool stm32f4 = uart_info->stm32f4;
 
-       if ((readl(base + ISR_OFFSET(stm32f4)) & USART_ISR_FLAG_TXE) == 0)
+       if ((readl(base + ISR_OFFSET(stm32f4)) & USART_ISR_TXE) == 0)
                return -EAGAIN;
 
        writel(c, base + TDR_OFFSET(stm32f4));
@@ -97,10 +97,10 @@ static int stm32_serial_pending(struct udevice *dev, bool input)
 
        if (input)
                return readl(base + ISR_OFFSET(stm32f4)) &
-                       USART_ISR_FLAG_RXNE ? 1 : 0;
+                       USART_ISR_RXNE ? 1 : 0;
        else
                return readl(base + ISR_OFFSET(stm32f4)) &
-                       USART_ISR_FLAG_TXE ? 0 : 1;
+                       USART_ISR_TXE ? 0 : 1;
 }
 
 static void _stm32_serial_init(fdt_addr_t base,

diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h
index 8a1a24fda8f4424288349ac8e25e25e5af1cf889..c478e3507020179f64895a8218b3c42050260e05 100644 (file)
--- a/drivers/serial/serial_stm32.h
+++ b/drivers/serial/serial_stm32.h
@@ -59,13 +59,13 @@ struct stm32x7_serial_platdata {
 
 #define USART_CR3_OVRDIS               BIT(12)
 
-#define USART_ISR_FLAG_ORE             BIT(3)
-#define USART_ISR_FLAG_RXNE            BIT(5)
-#define USART_ISR_FLAG_TXE             BIT(7)
+#define USART_ISR_TXE                  BIT(7)
+#define USART_ISR_RXNE                 BIT(5)
+#define USART_ISR_ORE                  BIT(3)
 
 #define USART_BRR_F_MASK               GENMASK(7, 0)
 #define USART_BRR_M_SHIFT              4
 #define USART_BRR_M_MASK               GENMASK(15, 4)
 
-#define USART_ICR_OREF                 BIT(3)
+#define USART_ICR_ORECF                        BIT(3)
 #endif